*
* i3 - an improved dynamic tiling window manager
*
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
*
* See file LICENSE for license information.
*
#include <xcb/xcb.h>
#include <xcb/xcb_atom.h>
#include <xcb/xcb_icccm.h>
+#include <xcb/randr.h>
#include <X11/XKBlib.h>
#include "data.h"
#include "xcb.h"
#include "util.h"
-#include "xinerama.h"
+#include "randr.h"
#include "config.h"
#include "queue.h"
#include "resize.h"
#include "workspace.h"
#include "log.h"
#include "container.h"
+#include "ipc.h"
/* After mapping/unmapping windows, a notify event is generated. However, we don’t want it,
since it’d trigger an infinite loop of switching between the different windows when
return false;
}
-/*
- * Due to bindings like Mode_switch + <a>, we need to bind some keys in XCB_GRAB_MODE_SYNC.
- * Therefore, we just replay all key presses.
- *
- */
-int handle_key_release(void *ignored, xcb_connection_t *conn, xcb_key_release_event_t *event) {
- xcb_allow_events(conn, XCB_ALLOW_REPLAY_KEYBOARD, event->time);
- xcb_flush(conn);
- return 1;
-}
-
/*
* There was a key press. We compare this key code with our bindings table and pass
* the bound action to parse_command().
state_filtered &= 0xFF;
DLOG("(removed upper 8 bits, state = %d)\n", state_filtered);
- if (xkb_supported) {
- /* We need to get the keysym group (There are group 1 to group 4, each holding
- two keysyms (without shift and with shift) using Xkb because X fails to
- provide them reliably (it works in Xephyr, it does not in real X) */
- XkbStateRec state;
- if (XkbGetState(xkbdpy, XkbUseCoreKbd, &state) == Success && (state.group+1) == 2)
- state_filtered |= BIND_MODE_SWITCH;
- }
+ if (xkb_current_group == XkbGroup2Index)
+ state_filtered |= BIND_MODE_SWITCH;
DLOG("(checked mode_switch, state %d)\n", state_filtered);
/* Find the binding */
- Binding *bind;
- TAILQ_FOREACH(bind, bindings, bindings) {
- /* First compare the modifiers */
- if (bind->mods != state_filtered)
- continue;
-
- /* If a symbol was specified by the user, we need to look in
- * the array of translated keycodes for the event’s keycode */
- if (bind->symbol != NULL) {
- if (memmem(bind->translated_to,
- bind->number_keycodes * sizeof(xcb_keycode_t),
- &(event->detail), sizeof(xcb_keycode_t)) != NULL)
- break;
- } else {
- /* This case is easier: The user specified a keycode */
- if (bind->keycode == event->detail)
- break;
+ Binding *bind = get_binding(state_filtered, event->detail);
+
+ /* No match? Then the user has Mode_switch enabled but does not have a
+ * specific keybinding. Fall back to the default keybindings (without
+ * Mode_switch). Makes it much more convenient for users of a hybrid
+ * layout (like us, ru). */
+ if (bind == NULL) {
+ state_filtered &= ~(BIND_MODE_SWITCH);
+ DLOG("no match, new state_filtered = %d\n", state_filtered);
+ if ((bind = get_binding(state_filtered, event->detail)) == NULL) {
+ ELOG("Could not lookup key binding (modifiers %d, keycode %d)\n",
+ state_filtered, event->detail);
+ return 1;
}
}
- /* No match? Then it was an actively grabbed key, that is with Mode_switch, and
- the user did not press Mode_switch, so just pass it… */
- if (bind == TAILQ_END(bindings)) {
- xcb_allow_events(conn, ReplayKeyboard, event->time);
- xcb_flush(conn);
- return 1;
- }
-
parse_command(conn, bind->command);
- if (state_filtered & BIND_MODE_SWITCH) {
- DLOG("Mode_switch -> allow_events(SyncKeyboard)\n");
- xcb_allow_events(conn, SyncKeyboard, event->time);
- xcb_flush(conn);
- }
return 1;
}
*
*/
static void check_crossing_screen_boundary(uint32_t x, uint32_t y) {
- i3Screen *screen;
+ Output *output;
- if ((screen = get_screen_containing(x, y)) == NULL) {
+ if ((output = get_output_containing(x, y)) == NULL) {
ELOG("ERROR: No such screen\n");
return;
}
- if (screen == c_ws->screen)
+ if (output == c_ws->output)
return;
c_ws->current_row = current_row;
c_ws->current_col = current_col;
- c_ws = screen->current_workspace;
+ c_ws = output->current_workspace;
current_row = c_ws->current_row;
current_col = c_ws->current_col;
- DLOG("We're now on virtual screen number %d\n", screen->num);
+ DLOG("We're now on output %p\n", output);
+
+ /* While usually this function is only called when the user switches
+ * to a different output using his mouse (and thus the output is
+ * empty), it may be that the following race condition occurs:
+ * 1) the user actives a new output (say VGA1).
+ * 2) the cursor is sent to the first pixel of the new VGA1, thus
+ * generating an enter_notify for the screen (the enter_notify
+ * is not yet received by i3).
+ * 3) i3 requeries screen configuration and maps a workspace onto the
+ * new output.
+ * 4) the enter_notify event arrives and c_ws is set to the new
+ * workspace but the existing windows on the new workspace are not
+ * focused.
+ *
+ * Therefore, we re-set the focus here to be sure it’s correct. */
+ Client *first_client = SLIST_FIRST(&(c_ws->focus_stack));
+ if (first_client != NULL)
+ set_focus(global_conn, first_client, true);
}
/*
return 1;
}
- if (client->workspace != c_ws && client->workspace->screen == c_ws->screen) {
+ if (client->workspace != c_ws && client->workspace->output == c_ws->output) {
/* This can happen when a client gets assigned to a different workspace than
* the current one (see src/mainx.c:reparent_window). Shortly after it was created,
* an enter_notify will follow. */
xcb_get_numlock_mask(conn);
ungrab_all_keys(conn);
- grab_all_keys(conn);
+ translate_keysyms();
+ grab_all_keys(conn, false);
return 0;
}
if (client_is_floating(client)) {
i3Font *font = load_font(conn, config.font);
int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT);
+ /* TODO: refactor this code. we need a function to translate
+ * coordinates of child_rect/rect. */
- if (event->value_mask & XCB_CONFIG_WINDOW_X)
- client->rect.x = event->x;
- if (event->value_mask & XCB_CONFIG_WINDOW_Y)
- client->rect.y = event->y;
+ if (event->value_mask & XCB_CONFIG_WINDOW_X) {
+ if (mode == MODE_STACK || mode == MODE_TABBED) {
+ client->rect.x = event->x - 2;
+ } else {
+ if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
+ client->rect.x = event->x;
+ else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
+ client->rect.x = event->x - 1;
+ else client->rect.x = event->x - 2;
+ }
+ }
+ if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
+ if (mode == MODE_STACK || mode == MODE_TABBED) {
+ client->rect.y = event->y - 2;
+ } else {
+ if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
+ client->rect.y = event->y;
+ else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
+ client->rect.y = event->y - 1;
+ else client->rect.y = event->y - font->height - 2 - 2;
+ }
+ }
if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.width = event->width + 2 + 2;
}
client->desired_height = event->height;
- render_workspace(conn, c_ws->screen, c_ws);
+ render_workspace(conn, c_ws->output, c_ws);
xcb_flush(conn);
return 1;
}
/*
- * Configuration notifies are only handled because we need to set up ignore for the following
- * enter notify events
+ * Configuration notifies are only handled because we need to set up ignore for
+ * the following enter notify events.
*
*/
int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_notify_event_t *event) {
- xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
-
/* We ignore this sequence twice because events for child and frame should be ignored */
add_ignore_event(event->sequence);
add_ignore_event(event->sequence);
- if (event->event == root) {
- DLOG("event->x = %d, ->y = %d, ->width = %d, ->height = %d\n", event->x, event->y, event->width, event->height);
- DLOG("reconfigure of the root window, need to xinerama\n");
- /* FIXME: Somehow, this is occuring too often. Therefore, we check for 0/0,
- but is there a better way? */
- if (event->x == 0 && event->y == 0)
- xinerama_requery_screens(conn);
- return 1;
- }
+ return 1;
+}
+
+/*
+ * Gets triggered upon a RandR screen change event, that is when the user
+ * changes the screen configuration in any way (mode, position, …)
+ *
+ */
+int handle_screen_change(void *prophs, xcb_connection_t *conn,
+ xcb_generic_event_t *e) {
+ DLOG("RandR screen change\n");
+
+ randr_query_outputs(conn);
return 1;
}
if (client->dock) {
DLOG("Removing from dock clients\n");
- SLIST_REMOVE(&(client->workspace->screen->dock_clients), client, Client, dock_clients);
+ SLIST_REMOVE(&(client->workspace->output->dock_clients), client, Client, dock_clients);
}
DLOG("child of 0x%08x.\n", client->frame);
Client *to_focus = (!workspace_empty ? SLIST_FIRST(&(client->workspace->focus_stack)) : NULL);
/* If this workspace is currently active, we don’t delete it */
- i3Screen *screen;
- TAILQ_FOREACH(screen, virtual_screens, screens)
+ Output *screen;
+ TAILQ_FOREACH(screen, &outputs, outputs)
if (screen->current_workspace == client->workspace) {
workspace_active = true;
workspace_empty = false;
break;
}
- if (workspace_empty)
- client->workspace->screen = NULL;
+ if (workspace_empty) {
+ client->workspace->output = NULL;
+ ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");
+ }
/* Remove the urgency flag if set */
client->urgent = false;
}
/* …or one of the bars? */
- i3Screen *screen;
- TAILQ_FOREACH(screen, virtual_screens, screens)
- if (screen->bar == event->window)
+ Output *output;
+ TAILQ_FOREACH(output, &outputs, outputs)
+ if (output->bar == event->window)
render_layout(conn);
return 1;
}
if ((size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)) {
// TODO: Minimum size is not yet implemented
- //LOG("Minimum size: %d (width) x %d (height)\n", size_hints.min_width, size_hints.min_height);
+ DLOG("Minimum size: %d (width) x %d (height)\n", size_hints.min_width, size_hints.min_height);
}
+ bool changed = false;
if ((size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)) {
- bool changed = false;
-
if (size_hints.width_inc > 0 && size_hints.width_inc < 0xFFFF)
if (client->width_increment != size_hints.width_inc) {
client->width_increment = size_hints.width_inc;
changed = true;
}
- if (changed) {
- resize_client(conn, client);
- xcb_flush(conn);
- }
+ if (changed)
+ DLOG("resize increments changed\n");
}
int base_width = 0, base_height = 0;
/* base_width/height are the desired size of the window.
We check if either the program-specified size or the program-specified
min-size is available */
- if (size_hints.flags & XCB_SIZE_HINT_P_SIZE) {
+ if (size_hints.flags & XCB_SIZE_HINT_BASE_SIZE) {
base_width = size_hints.base_width;
base_height = size_hints.base_height;
} else if (size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE) {
+ /* TODO: is this right? icccm says not */
base_width = size_hints.min_width;
base_height = size_hints.min_height;
}
client->base_width = base_width;
client->base_height = base_height;
DLOG("client's base_height changed to %d\n", base_height);
+ DLOG("client's base_width changed to %d\n", base_width);
+ changed = true;
+ }
+
+ if (changed) {
if (client->fullscreen)
DLOG("Not resizing client, it is in fullscreen mode\n");
- else
+ else {
resize_client(conn, client);
+ xcb_flush(conn);
+ }
}
/* If no aspect ratio was set or if it was invalid, we ignore the hints */
/* If the workspace this client is on is not visible, we need to redraw
* the workspace bar */
if (!workspace_is_visible(client->workspace)) {
- i3Screen *screen = client->workspace->screen;
- render_workspace(conn, screen, screen->current_workspace);
+ Output *output = client->workspace->output;
+ render_workspace(conn, output, output->current_workspace);
xcb_flush(conn);
}
return 1;
xcb_window_t *leader = xcb_get_property_value(prop);
- if (leader == NULL || *leader == 0)
+ if (leader == NULL)
return 1;
DLOG("Client leader changed to %08x\n", *leader);
projects / i3 / i3 / blobdiff