Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"Handle" events during startup (FS#877) 

awesome.c contains this comment:

    There can be no events yet, so if his function returns something, it must be
    an error.

Sadly, this wasn't true. It seems like something managed to generate
MappingNotify events (no idea how).

Fix this by discarding all pending events after our GrabServer, but before we
ask for SubstructureRedirect on the root window.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2011-04-10 14:28:34 +02:00
parent 9f8af0ae6d
commit 10186a7a29
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
awesome.c
View File

@ -320,6 +320,7 @@ main(int argc, char **argv)
ssize_t cmdlen = 1; ssize_t cmdlen = 1;
xdgHandle xdg; xdgHandle xdg;
bool no_argb = false; bool no_argb = false;
xcb_generic_event_t *event;
static struct option long_options[] = static struct option long_options[] =
{ {
{ "help", 0, NULL, 'h' }, { "help", 0, NULL, 'h' },
@ -446,10 +447,6 @@ main(int argc, char **argv)
/* initialize dbus */ /* initialize dbus */
a_dbus_init(); a_dbus_init();
/* Grab server */
xcb_grab_server(globalconf.connection);
xcb_flush(globalconf.connection);
/* Get the file descriptor corresponding to the X connection */ /* Get the file descriptor corresponding to the X connection */
xfd = xcb_get_file_descriptor(globalconf.connection); xfd = xcb_get_file_descriptor(globalconf.connection);
ev_io_init(&xio, &a_xcb_io_cb, xfd, EV_READ); ev_io_init(&xio, &a_xcb_io_cb, xfd, EV_READ);
@ -461,6 +458,22 @@ main(int argc, char **argv)
ev_prepare_start(globalconf.loop, &a_refresh); ev_prepare_start(globalconf.loop, &a_refresh);
ev_unref(globalconf.loop); ev_unref(globalconf.loop);
/* Grab server */
xcb_grab_server(globalconf.connection);
/* Make sure there are no pending events. Since we didn't really do anything
* at all yet, we will just discard all events which we received so far.
* The above GrabServer should make sure no new events are generated. */
xcb_aux_sync(globalconf.connection);
while ((event = xcb_poll_for_event(globalconf.connection)) != NULL)
{
/* Make sure errors are printed */
uint8_t response_type = XCB_EVENT_RESPONSE_TYPE(event);
if(response_type == 0)
event_handle(event);
p_delete(&event);
}
{ {
const uint32_t select_input_val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; const uint32_t select_input_val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;