*
* 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 "floating.h"
#include "workspace.h"
#include "log.h"
+#include "container.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
*
*/
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. */
return 1;
}
- set_focus(conn, client, false);
+ if (!config.disable_focus_follows_mouse)
+ set_focus(conn, client, false);
return 1;
}
}
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;
}
if (workspace_empty)
- client->workspace->screen = NULL;
+ client->workspace->output = NULL;
/* Remove the urgency flag if set */
client->urgent = false;
workspace_update_urgent_flag(client->workspace);
- FREE(client->window_class);
+ FREE(client->window_class_instance);
+ FREE(client->window_class_class);
FREE(client->name);
free(client);
if (client->dock)
return 1;
- if (client->container != NULL &&
- (client->container->mode == MODE_STACK ||
- client->container->mode == MODE_TABBED))
+ int mode = container_mode(client->container, true);
+ if (mode == MODE_STACK || mode == MODE_TABBED)
render_container(conn, client->container);
else decorate_window(conn, client, client->frame, client->titlegc, 0, 0);
xcb_flush(conn);
Client *client = table_get(&by_child, window);
if (client == NULL)
return 1;
- char *new_class;
- if (asprintf(&new_class, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) {
- perror("Could not get window class");
- DLOG("Could not get window class\n");
- return 1;
- }
- LOG("WM_CLASS changed to %s\n", new_class);
- char *old_class = client->window_class;
- client->window_class = new_class;
- FREE(old_class);
+ /* We cannot use asprintf here since this property contains two
+ * null-terminated strings (for compatibility reasons). Instead, we
+ * use strdup() on both strings */
+ char *new_class = xcb_get_property_value(prop);
- if (!client->initialized)
- return 1;
+ FREE(client->window_class_instance);
+ FREE(client->window_class_class);
- if (strcmp(new_class, "tools") == 0 || strcmp(new_class, "Dialog") == 0) {
- DLOG("tool/dialog window, should we put it floating?\n");
- if (client->floating == FLOATING_AUTO_OFF)
- toggle_floating_mode(conn, client, true);
- }
+ client->window_class_instance = strdup(new_class);
+ if ((strlen(new_class) + 1) < xcb_get_property_value_length(prop))
+ client->window_class_class = strdup(new_class + strlen(new_class) + 1);
+ else client->window_class_class = NULL;
+ LOG("WM_CLASS changed to %s (instance), %s (class)\n",
+ client->window_class_instance, client->window_class_class);
- return 1;
+ return 0;
}
/*
}
/* …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 (client->dock)
return 1;
- if (client->container == NULL ||
- (client->container->mode != MODE_STACK &&
- client->container->mode != MODE_TABBED))
+ if (container_mode(client->container, true) == MODE_DEFAULT)
decorate_window(conn, client, client->frame, client->titlegc, 0, 0);
else {
uint32_t background_color;
/* Draw a black background */
xcb_change_gc_single(conn, client->titlegc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
- if (client->titlebar_position == TITLEBAR_OFF) {
+ if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) {
xcb_rectangle_t crect = {1, 0, client->rect.width - (1 + 1), client->rect.height - 1};
xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
} else {
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)
+ 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 (size_hints.height_inc > 0)
+ if (size_hints.height_inc > 0 && size_hints.height_inc < 0xFFFF)
if (client->height_increment != size_hints.height_inc) {
client->height_increment = size_hints.height_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);
}
projects / i3 / i3 / blobdiff