*
*/
#include <time.h>
-#include <limits.h>
#include <xcb/randr.h>
changing workspaces */
static SLIST_HEAD(ignore_head, Ignore_Event) ignore_events;
+/*
+ * Adds the given sequence to the list of events which are ignored.
+ * If this ignore should only affect a specific response_type, pass
+ * response_type, otherwise, pass -1.
+ *
+ * Every ignored sequence number gets garbage collected after 5 seconds.
+ *
+ */
void add_ignore_event(const int sequence, const int response_type) {
struct Ignore_Event *event = smalloc(sizeof(struct Ignore_Event));
* Checks if the given sequence is ignored and returns true if so.
*
*/
-static bool event_is_ignored(const int sequence, const int response_type) {
+bool event_is_ignored(const int sequence, const int response_type) {
struct Ignore_Event *event;
time_t now = time(NULL);
for (event = SLIST_FIRST(&ignore_events); event != SLIST_END(&ignore_events);) {
if (event->sequence != sequence)
continue;
- if (event->response_type != 0 &&
+ if (event->response_type != -1 &&
event->response_type != response_type)
continue;
}
}
- parse_cmd(bind->command);
- tree_render();
+ char *json_result = parse_cmd(bind->command);
+ FREE(json_result);
return 1;
}
/* see if the user entered the window on a certain window decoration */
int layout = (enter_child ? con->parent->layout : con->layout);
- Con *child;
- TAILQ_FOREACH(child, &(con->nodes_head), nodes)
- if (rect_contains(child->deco_rect, event->event_x, event->event_y)) {
- LOG("using child %p / %s instead!\n", child, child->name);
- con = child;
- break;
- }
-
- /* for stacked/tabbed layout we do not want to change focus when the user
- * enters the window at the decoration of any child window. */
- if (layout == L_STACKED || layout == L_TABBED) {
- con = TAILQ_FIRST(&(con->parent->focus_head));
- LOG("using focused %p / %s instead\n", con, con->name);
+ if (layout == L_DEFAULT) {
+ Con *child;
+ TAILQ_FOREACH(child, &(con->nodes_head), nodes)
+ if (rect_contains(child->deco_rect, event->event_x, event->event_y)) {
+ LOG("using child %p / %s instead!\n", child, child->name);
+ con = child;
+ break;
+ }
}
#if 0
cookie = xcb_get_window_attributes_unchecked(conn, event->window);
DLOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence);
- add_ignore_event(event->sequence, 0);
+ add_ignore_event(event->sequence, -1);
manage_window(event->window, cookie, false);
x_push_changes(croot);
bsr.y += deco_height;
bsr.height -= deco_height;
}
- con = con->parent;
+ Con *floatingcon = con->parent;
DLOG("Container is a floating leaf node, will do that.\n");
if (event->value_mask & XCB_CONFIG_WINDOW_X) {
- con->rect.x = event->x + (-1) * bsr.x;
- DLOG("proposed x = %d, new x is %d\n", event->x, con->rect.x);
+ floatingcon->rect.x = event->x + (-1) * bsr.x;
+ DLOG("proposed x = %d, new x is %d\n", event->x, floatingcon->rect.x);
}
if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
- con->rect.y = event->y + (-1) * bsr.y;
- DLOG("proposed y = %d, new y is %d\n", event->y, con->rect.y);
+ floatingcon->rect.y = event->y + (-1) * bsr.y;
+ DLOG("proposed y = %d, new y is %d\n", event->y, floatingcon->rect.y);
}
if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
- con->rect.width = event->width + (-1) * bsr.width;
- DLOG("proposed width = %d, new width is %d\n", event->width, con->rect.width);
+ floatingcon->rect.width = event->width + (-1) * bsr.width;
+ floatingcon->rect.width += con->border_width * 2;
+ DLOG("proposed width = %d, new width is %d (x11 border %d)\n", event->width, floatingcon->rect.width, con->border_width);
}
if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
- con->rect.height = event->height + (-1) * bsr.height;
- DLOG("proposed height = %d, new height is %d\n", event->height, con->rect.height);
+ floatingcon->rect.height = event->height + (-1) * bsr.height;
+ floatingcon->rect.height += con->border_width * 2;
+ DLOG("proposed height = %d, new height is %d (x11 border %d)\n", event->height, floatingcon->rect.height, con->border_width);
}
+ floating_maybe_reassign_ws(floatingcon);
tree_render();
}
- fake_absolute_configure_notify(con);
-
- return 1;
-#if 0
- /* Dock clients can be reconfigured in their height */
- if (client->dock) {
- DLOG("Reconfiguring height of this dock client\n");
-
- if (!(event->value_mask & XCB_CONFIG_WINDOW_HEIGHT)) {
- DLOG("Ignoring configure request, no height given\n");
- return 1;
- }
-
- client->desired_height = event->height;
- render_workspace(conn, c_ws->output, c_ws);
- xcb_flush(conn);
-
- return 1;
- }
-
- if (client->fullscreen) {
- DLOG("Client is in fullscreen mode\n");
-
- Rect child_rect = client->container->workspace->rect;
- child_rect.x = child_rect.y = 0;
- fake_configure_notify(conn, child_rect, client->child);
+ /* Dock windows can be reconfigured in their height */
+ if (con->parent && con->parent->type == CT_DOCKAREA) {
+ DLOG("Dock window, only height reconfiguration allowed\n");
+ if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
+ DLOG("Height given, changing\n");
- return 1;
+ con->geometry.height = event->height;
+ tree_render();
}
+ }
- fake_absolute_configure_notify(conn, client);
+ fake_absolute_configure_notify(con);
- return 1;
-#endif
+ return 1;
}
#if 0
*
*/
static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) {
+ // XXX: this is commented out because in src/x.c we disable EnterNotify events
/* we need to ignore EnterNotify events which will be generated because a
* different window is visible now */
- add_ignore_event(event->sequence, XCB_ENTER_NOTIFY);
+ //add_ignore_event(event->sequence, XCB_ENTER_NOTIFY);
DLOG("UnmapNotify for 0x%08x (received from 0x%08x), serial %d\n", event->window, event->event, event->sequence);
Con *con = con_by_window_id(event->window);
return 1;
}
- tree_close(con, false, false);
+ tree_close(con, DONT_KILL_WINDOW, false, false);
tree_render();
x_push_changes(croot);
return 1;
* Called when a window changes its title
*
*/
-static int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
+static bool handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
- return 1;
+ return false;
- window_update_name(con->window, prop);
+ window_update_name(con->window, prop, false);
x_push_changes(croot);
- return 1;
+ return true;
}
/*
* window_update_name_legacy().
*
*/
-static int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state,
+static bool handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state,
xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
- return 1;
+ return false;
- window_update_name_legacy(con->window, prop);
+ window_update_name_legacy(con->window, prop, false);
x_push_changes(croot);
- return 1;
+ return true;
+}
+
+/*
+ * Called when a window changes its WM_WINDOW_ROLE.
+ *
+ */
+static bool handle_windowrole_change(void *data, xcb_connection_t *conn, uint8_t state,
+ xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
+ Con *con;
+ if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
+ return false;
+
+ window_update_role(con->window, prop, false);
+
+ return true;
}
+#if 0
/*
* Updates the client’s WM_CLASS property
*
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return 1;
- window_update_class(con->window, prop);
+ window_update_class(con->window, prop, false);
return 0;
}
+#endif
/*
* Expose event means we should redraw our windows (= title bar)
*
*/
static int handle_expose_event(xcb_expose_event_t *event) {
- Con *parent, *con;
+ Con *parent;
/* event->count is the number of minimum remaining expose events for this
* window, so we skip all events but the last one */
return 1;
}
- if (parent->window)
- x_draw_decoration(parent);
-
- TAILQ_FOREACH(con, &(parent->nodes_head), nodes) {
- DLOG("expose for con %p / %s\n", con, con->name);
- if (con->window)
- x_draw_decoration(con);
- }
-
- /* We also need to render the decorations of other Cons nearby the Con
- * itself to not get overlapping decorations */
- TAILQ_FOREACH(con, &(parent->parent->nodes_head), nodes) {
- DLOG("expose for con %p / %s\n", con, con->name);
- if (con->window)
- x_draw_decoration(con);
- }
+ /* re-render the parent (recursively, if it’s a split con) */
+ x_deco_recurse(parent);
xcb_flush(conn);
return 1;
(event->data.data32[0] == _NET_WM_STATE_ADD ||
event->data.data32[0] == _NET_WM_STATE_TOGGLE))) {
DLOG("toggling fullscreen\n");
- con_toggle_fullscreen(con);
+ con_toggle_fullscreen(con, CF_OUTPUT);
}
tree_render();
* See ICCCM 4.1.2.3 for more details
*
*/
-static int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static bool handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
xcb_atom_t name, xcb_get_property_reply_t *reply) {
Con *con = con_by_window_id(window);
if (con == NULL) {
DLOG("Received WM_NORMAL_HINTS for unknown client\n");
- return 1;
+ return false;
}
xcb_size_hints_t size_hints;
con->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 no aspect ratio was set or if it was invalid, we ignore the hints */
/* Check if we need to set proportional_* variables using the correct ratio */
if ((width / height) < min_aspect) {
- con->proportional_width = width;
- con->proportional_height = width / min_aspect;
+ if (con->proportional_width != width ||
+ con->proportional_height != (width / min_aspect)) {
+ con->proportional_width = width;
+ con->proportional_height = width / min_aspect;
+ changed = true;
+ }
} else if ((width / height) > max_aspect) {
- con->proportional_width = width;
- con->proportional_height = width / max_aspect;
+ if (con->proportional_width != width ||
+ con->proportional_height != (width / max_aspect)) {
+ con->proportional_width = width;
+ con->proportional_height = width / max_aspect;
+ changed = true;
+ }
} else goto render_and_return;
render_and_return:
- tree_render();
- return 1;
+ if (changed)
+ tree_render();
+ FREE(reply);
+ return true;
}
/*
* Handles the WM_HINTS property for extracting the urgency state of the window.
*
*/
-static int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static bool handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
xcb_atom_t name, xcb_get_property_reply_t *reply) {
Con *con = con_by_window_id(window);
if (con == NULL) {
DLOG("Received WM_HINTS for unknown client\n");
- return 1;
+ return false;
}
xcb_icccm_wm_hints_t hints;
if (reply != NULL) {
if (!xcb_icccm_get_wm_hints_from_reply(&hints, reply))
- return 1;
+ return false;
} else {
if (!xcb_icccm_get_wm_hints_reply(conn, xcb_icccm_get_wm_hints_unchecked(conn, con->window->id), &hints, NULL))
- return 1;
+ return false;
}
if (!con->urgent && focused == con) {
DLOG("Ignoring urgency flag for current client\n");
- return 1;
+ FREE(reply);
+ return true;
}
/* Update the flag on the client directly */
//CLIENT_LOG(con);
LOG("Urgency flag changed to %d\n", con->urgent);
- workspace_update_urgent_flag(con_get_workspace(con));
+ Con *ws;
+ /* Set the urgency flag on the workspace, if a workspace could be found
+ * (for dock clients, that is not the case). */
+ if ((ws = con_get_workspace(con)) != NULL)
+ workspace_update_urgent_flag(ws);
+
+ tree_render();
#if 0
/* If the workspace this client is on is not visible, we need to redraw
}
#endif
- return 1;
+ FREE(reply);
+ return true;
}
/*
* See ICCCM 4.1.2.6 for more details
*
*/
-static int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static bool handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
xcb_atom_t name, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL) {
DLOG("No such window\n");
- return 1;
+ return false;
}
if (prop == NULL) {
prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
- false, window, A_WM_TRANSIENT_FOR, A_WINDOW, 0, 32), NULL);
+ false, window, XCB_ATOM_WM_TRANSIENT_FOR, XCB_ATOM_WINDOW, 0, 32), NULL);
if (prop == NULL)
- return 1;
+ return false;
}
window_update_transient_for(con->window, prop);
}
#endif
- return 1;
+ return true;
}
/*
* toolwindow (or similar) and to which window it belongs (logical parent).
*
*/
-static int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
xcb_atom_t name, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
- return 1;
+ return false;
if (prop == NULL) {
prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
- false, window, A_WM_CLIENT_LEADER, A_WINDOW, 0, 32), NULL);
+ false, window, A_WM_CLIENT_LEADER, XCB_ATOM_WINDOW, 0, 32), NULL);
if (prop == NULL)
- return 1;
+ return false;
}
window_update_leader(con->window, prop);
- return 1;
+ return true;
}
/*
return 1;
}
-typedef int (*cb_property_handler_t)(void *data, xcb_connection_t *c, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *property);
+/* Returns false if the event could not be processed (e.g. the window could not
+ * be found), true otherwise */
+typedef bool (*cb_property_handler_t)(void *data, xcb_connection_t *c, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *property);
struct property_handler_t {
xcb_atom_t atom;
{ 0, 128, handle_windowname_change_legacy },
{ 0, UINT_MAX, handle_normal_hints },
{ 0, UINT_MAX, handle_clientleader_change },
- { 0, UINT_MAX, handle_transient_for }
+ { 0, UINT_MAX, handle_transient_for },
+ { 0, 128, handle_windowrole_change }
};
#define NUM_HANDLERS (sizeof(property_handlers) / sizeof(struct property_handler_t))
*/
void property_handlers_init() {
property_handlers[0].atom = A__NET_WM_NAME;
- property_handlers[1].atom = A_WM_HINTS;
- property_handlers[2].atom = A_WM_NAME;
- property_handlers[3].atom = A_WM_NORMAL_HINTS;
+ property_handlers[1].atom = XCB_ATOM_WM_HINTS;
+ property_handlers[2].atom = XCB_ATOM_WM_NAME;
+ property_handlers[3].atom = XCB_ATOM_WM_NORMAL_HINTS;
property_handlers[4].atom = A_WM_CLIENT_LEADER;
- property_handlers[5].atom = A_WM_TRANSIENT_FOR;
+ property_handlers[5].atom = XCB_ATOM_WM_TRANSIENT_FOR;
+ property_handlers[6].atom = A_WM_WINDOW_ROLE;
}
-static int property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) {
+static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) {
struct property_handler_t *handler = NULL;
xcb_get_property_reply_t *propr = NULL;
- int ret;
for (int c = 0; c < sizeof(property_handlers) / sizeof(struct property_handler_t); c++) {
if (property_handlers[c].atom != atom)
if (handler == NULL) {
DLOG("Unhandled property notify for atom %d (0x%08x)\n", atom, atom);
- return 0;
+ return;
}
if (state != XCB_PROPERTY_DELETE) {
propr = xcb_get_property_reply(conn, cookie, 0);
}
- ret = handler->cb(NULL, conn, state, window, atom, propr);
- FREE(propr);
- return ret;
+ /* the handler will free() the reply unless it returns false */
+ if (!handler->cb(NULL, conn, state, window, atom, propr))
+ FREE(propr);
}
/*
projects / i3 / i3 / blobdiff