+#undef I3__FILE__
+#define I3__FILE__ "click.c"
/*
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
*
* click.c: Button press (mouse click) events.
*
* then calls resize_graphical_handler().
*
*/
-static bool tiling_resize_for_border(Con *con, border_t border, const xcb_button_press_event_t *event) {
- DLOG("border = %d\n", border);
+static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press_event_t *event) {
+ DLOG("border = %d, con = %p\n", border, con);
char way = (border == BORDER_TOP || border == BORDER_LEFT ? 'p' : 'n');
orientation_t orientation = (border == BORDER_TOP || border == BORDER_BOTTOM ? VERT : HORIZ);
Con *resize_con = con;
while (resize_con->type != CT_WORKSPACE &&
resize_con->type != CT_FLOATING_CON &&
- resize_con->parent->orientation != orientation)
+ con_orientation(resize_con->parent) != orientation)
resize_con = resize_con->parent;
+ DLOG("resize_con = %p\n", resize_con);
if (resize_con->type != CT_WORKSPACE &&
resize_con->type != CT_FLOATING_CON &&
- resize_con->parent->orientation == orientation) {
+ con_orientation(resize_con->parent) == orientation) {
first = resize_con;
second = (way == 'n') ? TAILQ_NEXT(first, nodes) : TAILQ_PREV(first, nodes_head, nodes);
if (second == TAILQ_END(&(first->nodes_head))) {
first = second;
second = tmp;
}
+ DLOG("first = %p, second = %p, resize_con = %p\n",
+ first, second, resize_con);
}
if (first == NULL || second == NULL) {
DLOG("Resize not possible\n");
return false;
}
- else {
- assert(first != second);
- assert(first->parent == second->parent);
- resize_graphical_handler(first, second, orientation, event);
- }
+
+ assert(first != second);
+ assert(first->parent == second->parent);
+
+ /* We modify the X/Y position in the event so that the divider line is at
+ * the actual position of the border, not at the position of the click. */
+ if (orientation == HORIZ)
+ event->root_x = second->rect.x;
+ else event->root_y = second->rect.y;
+
+ resize_graphical_handler(first, second, orientation, event);
DLOG("After resize handler, rendering\n");
tree_render();
* to the client).
*
*/
-static bool floating_mod_on_tiled_client(Con *con, const xcb_button_press_event_t *event) {
+static bool floating_mod_on_tiled_client(Con *con, xcb_button_press_event_t *event) {
/* The client is in tiling layout. We can still initiate a resize with the
* right mouse button, by chosing the border which is the most near one to
* the position of the mouse pointer */
* Finds out which border was clicked on and calls tiling_resize_for_border().
*
*/
-static bool tiling_resize(Con *con, const xcb_button_press_event_t *event, const click_destination_t dest) {
+static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click_destination_t dest) {
/* check if this was a click on the window border (and on which one) */
Rect bsr = con_border_style_rect(con);
DLOG("BORDER x = %d, y = %d for con %p, window 0x%08x\n",
* window. Decorations will end up next to each other and the user
* expects to switch to a window by clicking on its decoration. */
- /* To make the check actually work in case of a h-split container, we
- * need to find the resize con in this function (as opposed to in
- * tiling_resize_for_border()). The con which was passed is the actualy
- * child window, not the split container. */
- while (con->type != CT_WORKSPACE &&
- con->type != CT_FLOATING_CON &&
- con->parent->orientation != VERT)
- con = con->parent;
-
- if ((con->layout == L_STACKED ||
- con->layout == L_TABBED ||
- con->orientation == HORIZ) &&
- con_num_children(con) > 1) {
+ /* Since the container might either be the child *or* already a split
+ * container (in the case of a nested split container), we need to make
+ * sure that we are dealing with the split container here. */
+ Con *check_con = con;
+ if (con_is_leaf(check_con) && check_con->parent->type == CT_CON)
+ check_con = check_con->parent;
+
+ if ((check_con->layout == L_STACKED ||
+ check_con->layout == L_TABBED ||
+ con_orientation(check_con) == HORIZ) &&
+ con_num_children(check_con) > 1) {
DLOG("Not handling this resize, this container has > 1 child.\n");
return false;
}
* functions for resizing/dragging.
*
*/
-static int route_click(Con *con, const xcb_button_press_event_t *event, const bool mod_pressed, const click_destination_t dest) {
+static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod_pressed, const click_destination_t dest) {
DLOG("--> click properties: mod = %d, destination = %d\n", mod_pressed, dest);
DLOG("--> OUTCOME = %p\n", con);
DLOG("type = %d, name = %s\n", con->type, con->name);
+ /* Any click in a workspace should focus that workspace. If the
+ * workspace is on another output we need to do a workspace_show in
+ * order for i3bar (and others) to notice the change in workspace. */
+ Con *ws = con_get_workspace(con);
+ Con *focused_workspace = con_get_workspace(focused);
+
+ if (!ws) {
+ ws = TAILQ_FIRST(&(output_get_content(con_get_output(con))->focus_head));
+ if (!ws)
+ goto done;
+ }
+
+ if (ws != focused_workspace)
+ workspace_show(ws);
+ focused_id = XCB_NONE;
+
/* don’t handle dockarea cons, they must not be focused */
if (con->parent->type == CT_DOCKAREA)
goto done;
event->detail == XCB_BUTTON_INDEX_5)) {
DLOG("Scrolling on a window decoration\n");
orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ);
- if (event->detail == XCB_BUTTON_INDEX_4)
+ /* To prevent scrolling from going outside the container (see ticket
+ * #557), we first check if scrolling is possible at all. */
+ Con *focused = con_descend_focused(con->parent);
+ bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);
+ bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL);
+ if (event->detail == XCB_BUTTON_INDEX_4 && scroll_prev_possible)
tree_next('p', orientation);
- else tree_next('n', orientation);
+ else if (event->detail == XCB_BUTTON_INDEX_5 && scroll_next_possible)
+ tree_next('n', orientation);
goto done;
}
- /* 2: focus this con */
+ /* 2: focus this con. */
con_focus(con);
/* 3: For floating containers, we also want to raise them on click.
* We will skip handling events on floating cons in fullscreen mode */
- Con *ws = con_get_workspace(con);
Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
- if (floatingcon != NULL && fs == NULL) {
+ if (floatingcon != NULL && fs != con) {
floating_raise_con(floatingcon);
/* 4: floating_modifier plus left mouse button drags */
- if (mod_pressed && event->detail == 1) {
+ if (mod_pressed && event->detail == XCB_BUTTON_INDEX_1) {
floating_drag_window(floatingcon, event);
return 1;
}
}
/* 7: floating modifier pressed, initiate a resize */
- if (mod_pressed && event->detail == 3) {
+ if (dest == CLICK_INSIDE && mod_pressed && event->detail == 3) {
if (floating_mod_on_tiled_client(con, event))
return 1;
}
/* 8: otherwise, check for border/decoration clicks and resize */
- else if (dest == CLICK_BORDER || dest == CLICK_DECORATION) {
+ else if ((dest == CLICK_BORDER || dest == CLICK_DECORATION) &&
+ (event->detail == XCB_BUTTON_INDEX_1 ||
+ event->detail == XCB_BUTTON_INDEX_3)) {
DLOG("Trying to resize (tiling)\n");
tiling_resize(con, event, dest);
}
return route_click(con, event, mod_pressed, CLICK_INSIDE);
if (!(con = con_by_frame_id(event->event))) {
+ /* If the root window is clicked, find the relevant output from the
+ * click coordinates and focus the output's active workspace. */
+ if (event->event == root) {
+ Con *output, *ws;
+ TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
+ if (con_is_internal(output) ||
+ !rect_contains(output->rect, event->event_x, event->event_y))
+ continue;
+
+ ws = TAILQ_FIRST(&(output_get_content(output)->focus_head));
+ if (ws != con_get_workspace(focused)) {
+ workspace_show(ws);
+ tree_render();
+ }
+ return 1;
+ }
+ return 0;
+ }
+
ELOG("Clicked into unknown window?!\n");
xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
xcb_flush(conn);
projects / i3 / i3 / blobdiff