X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhandlers.c;h=596d15a6e40f532afdff76623cc0eebe181b4ed9;hb=e114b3dba2485606cf5a3d044c0de8430c9f80b4;hp=f19b53c8fce793bfda24034a18a8cad74fa9b3a9;hpb=eb0a56fad1a9048e3905972f5db0d61c5bd13516;p=i3%2Fi3 diff --git a/src/handlers.c b/src/handlers.c index f19b53c8..596d15a6 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -2,16 +2,19 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) + * + * handlers.c: Small handlers for various events (keypresses, focus changes, + * …). * */ -#include +#include "all.h" +#include #include - #include - -#include "all.h" +#define SN_API_NOT_YET_FROZEN 1 +#include int randr_base = -1; @@ -79,7 +82,10 @@ bool event_is_ignored(const int sequence, const int response_type) { * the bound action to parse_command(). * */ -static int handle_key_press(xcb_key_press_event_t *event) { +static void handle_key_press(xcb_key_press_event_t *event) { + + last_timestamp = event->time; + DLOG("Keypress %d, state raw = %d\n", event->detail, event->state); /* Remove the numlock bit, all other bits are modifiers we can bind to */ @@ -108,13 +114,16 @@ static int handle_key_press(xcb_key_press_event_t *event) { 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; + return; } } - char *json_result = parse_cmd(bind->command); - FREE(json_result); - return 1; + struct CommandResult *command_output = parse_command(bind->command); + + if (command_output->needs_tree_render) + tree_render(); + + free(command_output->json_output); } /* @@ -142,7 +151,11 @@ static void check_crossing_screen_boundary(uint32_t x, uint32_t y) { /* Focus the output on which the user moved his cursor */ Con *old_focused = focused; - con_focus(con_descend_focused(output_get_content(output->con))); + Con *next = con_descend_focused(output_get_content(output->con)); + /* Since we are switching outputs, this *must* be a different workspace, so + * call workspace_show() */ + workspace_show(con_get_workspace(next)); + con_focus(next); /* If the focus changed, we re-render to get updated decorations */ if (old_focused != focused) @@ -153,21 +166,23 @@ static void check_crossing_screen_boundary(uint32_t x, uint32_t y) { * When the user moves the mouse pointer onto a window, this callback gets called. * */ -static int handle_enter_notify(xcb_enter_notify_event_t *event) { +static void handle_enter_notify(xcb_enter_notify_event_t *event) { Con *con; + last_timestamp = event->time; + DLOG("enter_notify for %08x, mode = %d, detail %d, serial %d\n", event->event, event->mode, event->detail, event->sequence); DLOG("coordinates %d, %d\n", event->event_x, event->event_y); if (event->mode != XCB_NOTIFY_MODE_NORMAL) { DLOG("This was not a normal notify, ignoring\n"); - return 1; + return; } /* Some events are not interesting, because they were not generated * actively by the user, but by reconfiguration of windows */ if (event_is_ignored(event->sequence, XCB_ENTER_NOTIFY)) { DLOG("Event ignored\n"); - return 1; + return; } bool enter_child = false; @@ -181,12 +196,12 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { if (con == NULL) { DLOG("Getting screen at %d x %d\n", event->root_x, event->root_y); check_crossing_screen_boundary(event->root_x, event->root_y); - return 1; + return; } if (con->parent->type == CT_DOCKAREA) { DLOG("Ignoring, this is a dock client\n"); - return 1; + return; } /* see if the user entered the window on a certain window decoration */ @@ -212,12 +227,19 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { #endif if (config.disable_focus_follows_mouse) - return 1; + return; + + /* Get the currently focused workspace to check if the focus change also + * involves changing workspaces. If so, we need to call workspace_show() to + * correctly update state and send the IPC event. */ + Con *ws = con_get_workspace(con); + if (ws != con_get_workspace(focused)) + workspace_show(ws); con_focus(con_descend_focused(con)); tree_render(); - return 1; + return; } /* @@ -226,23 +248,26 @@ static int handle_enter_notify(xcb_enter_notify_event_t *event) { * and crossing virtual screen boundaries), this callback gets called. * */ -static int handle_motion_notify(xcb_motion_notify_event_t *event) { +static void handle_motion_notify(xcb_motion_notify_event_t *event) { + + last_timestamp = event->time; + /* Skip events where the pointer was over a child window, we are only * interested in events on the root window. */ if (event->child != 0) - return 1; + return; Con *con; if ((con = con_by_frame_id(event->event)) == NULL) { check_crossing_screen_boundary(event->root_x, event->root_y); - return 1; + return; } if (config.disable_focus_follows_mouse) - return 1; + return; if (con->layout != L_DEFAULT) - return 1; + return; /* see over which rect the user is */ Con *current; @@ -252,14 +277,14 @@ static int handle_motion_notify(xcb_motion_notify_event_t *event) { /* We found the rect, let’s see if this window is focused */ if (TAILQ_FIRST(&(con->focus_head)) == current) - return 1; + return; con_focus(current); x_push_changes(croot); - return 1; + return; } - return 1; + return; } /* @@ -267,28 +292,28 @@ static int handle_motion_notify(xcb_motion_notify_event_t *event) { * we need to update our key bindings then (re-translate symbols). * */ -static int handle_mapping_notify(xcb_mapping_notify_event_t *event) { +static void handle_mapping_notify(xcb_mapping_notify_event_t *event) { if (event->request != XCB_MAPPING_KEYBOARD && event->request != XCB_MAPPING_MODIFIER) - return 0; + return; DLOG("Received mapping_notify for keyboard or modifier mapping, re-grabbing keys\n"); xcb_refresh_keyboard_mapping(keysyms, event); - xcb_get_numlock_mask(conn); + xcb_numlock_mask = aio_get_mod_mask_for(XCB_NUM_LOCK, keysyms); ungrab_all_keys(conn); translate_keysyms(); grab_all_keys(conn, false); - return 0; + return; } /* * A new window appeared on the screen (=was mapped), so let’s manage it. * */ -static int handle_map_request(xcb_map_request_event_t *event) { +static void handle_map_request(xcb_map_request_event_t *event) { xcb_get_window_attributes_cookie_t cookie; cookie = xcb_get_window_attributes_unchecked(conn, event->window); @@ -298,16 +323,18 @@ static int handle_map_request(xcb_map_request_event_t *event) { manage_window(event->window, cookie, false); x_push_changes(croot); - return 1; + return; } /* - * Configure requests are received when the application wants to resize windows on their own. + * Configure requests are received when the application wants to resize windows + * on their own. * - * We generate a synthethic configure notify event to signalize the client its "new" position. + * We generate a synthethic configure notify event to signalize the client its + * "new" position. * */ -static int handle_configure_request(xcb_configure_request_event_t *event) { +static void handle_configure_request(xcb_configure_request_event_t *event) { Con *con; DLOG("window 0x%08x wants to be at %dx%d with %dx%d\n", @@ -339,7 +366,7 @@ static int handle_configure_request(xcb_configure_request_event_t *event) { xcb_configure_window(conn, event->window, mask, values); xcb_flush(conn); - return 1; + return; } DLOG("Configure request!\n"); @@ -353,61 +380,50 @@ static int handle_configure_request(xcb_configure_request_event_t *event) { bsr.y += deco_height; bsr.height -= deco_height; } - con = con->parent; - DLOG("Container is a floating leaf node, will do that.\n"); + Con *floatingcon = con->parent; + + Rect newrect = floatingcon->rect; + 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); + newrect.x = event->x + (-1) * bsr.x; + DLOG("proposed x = %d, new x is %d\n", event->x, newrect.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); + newrect.y = event->y + (-1) * bsr.y; + DLOG("proposed y = %d, new y is %d\n", event->y, newrect.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); + newrect.width = event->width + (-1) * bsr.width; + newrect.width += con->border_width * 2; + DLOG("proposed width = %d, new width is %d (x11 border %d)\n", + event->width, newrect.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); + newrect.height = event->height + (-1) * bsr.height; + newrect.height += con->border_width * 2; + DLOG("proposed height = %d, new height is %d (x11 border %d)\n", + event->height, newrect.height, con->border_width); } - 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"); + DLOG("Container is a floating leaf node, will do that.\n"); + floating_reposition(floatingcon, newrect); + return; + } - 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; } #if 0 @@ -431,14 +447,14 @@ int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_n * changes the screen configuration in any way (mode, position, …) * */ -static int handle_screen_change(xcb_generic_event_t *e) { +static void handle_screen_change(xcb_generic_event_t *e) { DLOG("RandR screen change\n"); randr_query_outputs(); ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}"); - return 1; + return; } /* @@ -446,13 +462,9 @@ static int handle_screen_change(xcb_generic_event_t *e) { * now, so we better clean up before. * */ -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); - +static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { DLOG("UnmapNotify for 0x%08x (received from 0x%08x), serial %d\n", event->window, event->event, event->sequence); + xcb_get_input_focus_cookie_t cookie; Con *con = con_by_window_id(event->window); if (con == NULL) { /* This could also be an UnmapNotify for the frame. We need to @@ -460,63 +472,52 @@ static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { con = con_by_frame_id(event->window); if (con == NULL) { LOG("Not a managed window, ignoring UnmapNotify event\n"); - return 1; + return; } + if (con->ignore_unmap > 0) con->ignore_unmap--; + /* See the end of this function. */ + cookie = xcb_get_input_focus(conn); DLOG("ignore_unmap = %d for frame of container %p\n", con->ignore_unmap, con); - return 1; + goto ignore_end; } + /* See the end of this function. */ + cookie = xcb_get_input_focus(conn); + if (con->ignore_unmap > 0) { DLOG("ignore_unmap = %d, dec\n", con->ignore_unmap); con->ignore_unmap--; - return 1; + goto ignore_end; } - tree_close(con, DONT_KILL_WINDOW, false); + tree_close(con, DONT_KILL_WINDOW, false, false); tree_render(); x_push_changes(croot); - return 1; -#if 0 - if (client == NULL) { - DLOG("not a managed window. Ignoring.\n"); - - /* This was most likely the destroyed frame of a client which is - * currently being unmapped, so we add this sequence (again!) to - * the ignore list (enter_notify events will get sent for both, - * the child and its frame). */ - add_ignore_event(event->sequence); - - return 0; - } -#endif - - -#if 0 - /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */ - bool workspace_empty = SLIST_EMPTY(&(client->workspace->focus_stack)); - bool workspace_focused = (c_ws == client->workspace); - Client *to_focus = (!workspace_empty ? SLIST_FIRST(&(client->workspace->focus_stack)) : NULL); - - /* If this workspace is currently visible, we don’t delete it */ - if (workspace_is_visible(client->workspace)) - workspace_empty = false; - - 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; - workspace_update_urgent_flag(client->workspace); - - render_layout(conn); -#endif - - return 1; +ignore_end: + /* If the client (as opposed to i3) destroyed or unmapped a window, an + * EnterNotify event will follow (indistinguishable from an EnterNotify + * event caused by moving your mouse), causing i3 to set focus to whichever + * window is now visible. + * + * In a complex stacked or tabbed layout (take two v-split containers in a + * tabbed container), when the bottom window in tab2 is closed, the bottom + * window of tab1 is visible instead. X11 will thus send an EnterNotify + * event for the bottom window of tab1, while the focus should be set to + * the remaining window of tab2. + * + * Therefore, we ignore all EnterNotify events which have the same sequence + * as an UnmapNotify event. */ + add_ignore_event(event->sequence, XCB_ENTER_NOTIFY); + + /* Since we just ignored the sequence of this UnmapNotify, we want to make + * sure that following events use a different sequence. When putting xterm + * into fullscreen and moving the pointer to a different window, without + * using GetInputFocus, subsequent (legitimate) EnterNotify events arrived + * with the same sequence and thus were ignored (see ticket #609). */ + free(xcb_get_input_focus_reply(conn, cookie, NULL)); } /* @@ -528,7 +529,7 @@ static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { * important fields in the event data structure). * */ -static int handle_destroy_notify_event(xcb_destroy_notify_event_t *event) { +static void handle_destroy_notify_event(xcb_destroy_notify_event_t *event) { DLOG("destroy notify for 0x%08x, 0x%08x\n", event->event, event->window); xcb_unmap_notify_event_t unmap; @@ -536,7 +537,7 @@ static int handle_destroy_notify_event(xcb_destroy_notify_event_t *event) { unmap.event = event->event; unmap.window = event->window; - return handle_unmap_notify_event(&unmap); + handle_unmap_notify_event(&unmap); } /* @@ -574,6 +575,21 @@ static bool handle_windowname_change_legacy(void *data, xcb_connection_t *conn, 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 @@ -595,46 +611,51 @@ static int handle_windowclass_change(void *data, xcb_connection_t *conn, uint8_t * Expose event means we should redraw our windows (= title bar) * */ -static int handle_expose_event(xcb_expose_event_t *event) { +static void handle_expose_event(xcb_expose_event_t *event) { Con *parent; - /* event->count is the number of minimum remaining expose events for this - * window, so we skip all events but the last one */ - if (event->count != 0) - return 1; - DLOG("window = %08x\n", event->window); if ((parent = con_by_frame_id(event->window)) == NULL) { LOG("expose event for unknown window, ignoring\n"); - return 1; + return; } - /* re-render the parent (recursively, if it’s a split con) */ - x_deco_recurse(parent); + /* Since we render to our pixmap on every change anyways, expose events + * only tell us that the X server lost (parts of) the window contents. We + * can handle that by copying the appropriate part from our pixmap to the + * window. */ + xcb_copy_area(conn, parent->pixmap, parent->frame, parent->pm_gc, + event->x, event->y, event->x, event->y, + event->width, event->height); xcb_flush(conn); - return 1; + return; } /* * Handle client messages (EWMH) * */ -static int handle_client_message(xcb_client_message_event_t *event) { +static void handle_client_message(xcb_client_message_event_t *event) { + /* If this is a startup notification ClientMessage, the library will handle + * it and call our monitor_event() callback. */ + if (sn_xcb_display_process_event(sndisplay, (xcb_generic_event_t*)event)) + return; + LOG("ClientMessage for window 0x%08x\n", event->window); if (event->type == A__NET_WM_STATE) { if (event->format != 32 || event->data.data32[1] != A__NET_WM_STATE_FULLSCREEN) { DLOG("atom in clientmessage is %d, fullscreen is %d\n", event->data.data32[1], A__NET_WM_STATE_FULLSCREEN); DLOG("not about fullscreen atom\n"); - return 0; + return; } Con *con = con_by_window_id(event->window); if (con == NULL) { DLOG("Could not get window for client message\n"); - return 0; + return; } /* Check if the fullscreen state should be toggled */ @@ -650,12 +671,29 @@ static int handle_client_message(xcb_client_message_event_t *event) { tree_render(); x_push_changes(croot); + } else if (event->type == A_I3_SYNC) { + DLOG("i3 sync, yay\n"); + xcb_window_t window = event->data.data32[0]; + uint32_t rnd = event->data.data32[1]; + DLOG("Sending random value %d back to X11 window 0x%08x\n", rnd, window); + + void *reply = scalloc(32); + xcb_client_message_event_t *ev = reply; + + ev->response_type = XCB_CLIENT_MESSAGE; + ev->window = window; + ev->type = A_I3_SYNC; + ev->format = 32; + ev->data.data32[0] = window; + ev->data.data32[1] = rnd; + + xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev); + xcb_flush(conn); + free(reply); } else { - ELOG("unhandled clientmessage\n"); - return 0; + DLOG("unhandled clientmessage\n"); + return; } - - return 1; } #if 0 @@ -797,23 +835,29 @@ static bool handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_ xcb_icccm_wm_hints_t hints; - if (reply != NULL) { - if (!xcb_icccm_get_wm_hints_from_reply(&hints, reply)) + if (reply == NULL) + if (!(reply = xcb_get_property_reply(conn, xcb_icccm_get_wm_hints(conn, window), NULL))) return false; - } else { - if (!xcb_icccm_get_wm_hints_reply(conn, xcb_icccm_get_wm_hints_unchecked(conn, con->window->id), &hints, NULL)) - return false; - } + + if (!xcb_icccm_get_wm_hints_from_reply(&hints, reply)) + return false; if (!con->urgent && focused == con) { DLOG("Ignoring urgency flag for current client\n"); - FREE(reply); - return true; + con->window->urgent = 0; + goto end; } /* Update the flag on the client directly */ con->urgent = (xcb_icccm_wm_hints_get_urgency(&hints) != 0); //CLIENT_LOG(con); + if (con->window) { + if (con->urgent) { + con->window->urgent = time(NULL); + } else { + con->window->urgent = 0; + } + } LOG("Urgency flag changed to %d\n", con->urgent); Con *ws; @@ -824,17 +868,10 @@ static bool handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_ tree_render(); -#if 0 - /* If the workspace this client is on is not visible, we need to redraw - * the workspace bar */ - if (!workspace_is_visible(client->workspace)) { - Output *output = client->workspace->output; - render_workspace(conn, output, output->current_workspace); - xcb_flush(conn); - } -#endif - - FREE(reply); +end: + if (con->window) + window_update_hints(con->window, reply); + else free(reply); return true; } @@ -856,21 +893,13 @@ static bool handle_transient_for(void *data, xcb_connection_t *conn, uint8_t sta 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 false; } window_update_transient_for(con->window, prop); - // TODO: put window in floating mode if con->window->transient_for != XCB_NONE: -#if 0 - if (client->floating == FLOATING_AUTO_OFF) { - DLOG("This is a popup window, putting into floating\n"); - toggle_floating_mode(conn, client, true); - } -#endif - return true; } @@ -887,7 +916,7 @@ static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8 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 false; } @@ -903,35 +932,49 @@ static bool handle_clientleader_change(void *data, xcb_connection_t *conn, uint8 * decorations accordingly. * */ -static int handle_focus_in(xcb_focus_in_event_t *event) { +static void handle_focus_in(xcb_focus_in_event_t *event) { DLOG("focus change in, for window 0x%08x\n", event->event); Con *con; if ((con = con_by_window_id(event->event)) == NULL || con->window == NULL) - return 1; + return; DLOG("That is con %p / %s\n", con, con->name); if (event->mode == XCB_NOTIFY_MODE_GRAB || event->mode == XCB_NOTIFY_MODE_UNGRAB) { DLOG("FocusIn event for grab/ungrab, ignoring\n"); - return 1; + return; } if (event->detail == XCB_NOTIFY_DETAIL_POINTER) { DLOG("notify detail is pointer, ignoring this event\n"); - return 1; + return; } if (focused_id == event->event) { DLOG("focus matches the currently focused window, not doing anything\n"); - return 1; + return; + } + + /* Skip dock clients, they cannot get the i3 focus. */ + if (con->parent->type == CT_DOCKAREA) { + DLOG("This is a dock client, not focusing.\n"); + return; } DLOG("focus is different, updating decorations\n"); + + /* Get the currently focused workspace to check if the focus change also + * involves changing workspaces. If so, we need to call workspace_show() to + * correctly update state and send the IPC event. */ + Con *ws = con_get_workspace(con); + if (ws != con_get_workspace(focused)) + workspace_show(ws); + con_focus(con); /* We update focused_id because we don’t need to set focus again */ focused_id = event->event; x_push_changes(croot); - return 1; + return; } /* Returns false if the event could not be processed (e.g. the window could not @@ -950,7 +993,8 @@ static struct property_handler_t property_handlers[] = { { 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)) @@ -960,12 +1004,16 @@ static struct property_handler_t property_handlers[] = { * */ void property_handlers_init() { + + sn_monitor_context_new(sndisplay, conn_screen, startup_monitor_event, NULL, NULL); + 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 void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) { @@ -981,7 +1029,7 @@ static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) } if (handler == NULL) { - DLOG("Unhandled property notify for atom %d (0x%08x)\n", atom, atom); + //DLOG("Unhandled property notify for atom %d (0x%08x)\n", atom, atom); return; } @@ -1062,14 +1110,15 @@ void handle_event(int type, xcb_generic_event_t *event) { handle_focus_in((xcb_focus_in_event_t*)event); break; - case XCB_PROPERTY_NOTIFY: - DLOG("Property notify\n"); + case XCB_PROPERTY_NOTIFY: { xcb_property_notify_event_t *e = (xcb_property_notify_event_t*)event; + last_timestamp = e->time; property_notify(e->state, e->window, e->atom); break; + } default: - DLOG("Unhandled event of type %d\n", type); + //DLOG("Unhandled event of type %d\n", type); break; } }