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

[event] Optimize xcb pointer and geometry queries.

This commit is contained in:
Arnaud Fontaine 2008-05-20 19:30:07 +01:00
parent ad84eb52db
commit d662c66526
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
event.c
View File

@ -68,6 +68,7 @@ event_handle_buttonpress(void *data __attribute__ ((unused)),
xcb_connection_t *connection, xcb_button_press_event_t *ev) xcb_connection_t *connection, xcb_button_press_event_t *ev)
{ {
int screen; int screen;
const int nb_screen = xcb_setup_roots_length(xcb_get_setup(connection));
client_t *c; client_t *c;
widget_node_t *w; widget_node_t *w;
statusbar_t *statusbar; statusbar_t *statusbar;
@ -146,7 +147,7 @@ event_handle_buttonpress(void *data __attribute__ ((unused)),
event_handle_mouse_button_press(ev->detail, ev->state, globalconf.buttons.client); event_handle_mouse_button_press(ev->detail, ev->state, globalconf.buttons.client);
} }
else else
for(screen = 0; screen < xcb_setup_roots_length(xcb_get_setup(connection)); screen++) for(screen = 0; screen < nb_screen; screen++)
if(xcb_aux_get_screen(connection, screen)->root == ev->event) if(xcb_aux_get_screen(connection, screen)->root == ev->event)
{ {
event_handle_mouse_button_press(ev->detail, ev->state, event_handle_mouse_button_press(ev->detail, ev->state,
@ -393,6 +394,7 @@ event_handle_maprequest(void *data __attribute__ ((unused)),
xcb_connection_t *connection, xcb_map_request_event_t *ev) xcb_connection_t *connection, xcb_map_request_event_t *ev)
{ {
int screen_nbr = 0; int screen_nbr = 0;
client_t *c;
xcb_get_window_attributes_cookie_t wa_c; xcb_get_window_attributes_cookie_t wa_c;
xcb_get_window_attributes_reply_t *wa_r; xcb_get_window_attributes_reply_t *wa_r;
xcb_query_pointer_cookie_t qp_c; xcb_query_pointer_cookie_t qp_c;
@ -402,8 +404,6 @@ event_handle_maprequest(void *data __attribute__ ((unused)),
xcb_screen_iterator_t iter; xcb_screen_iterator_t iter;
wa_c = xcb_get_window_attributes(connection, ev->window); wa_c = xcb_get_window_attributes(connection, ev->window);
geom_c = xcb_get_geometry(connection, ev->window);
qp_c = xcb_query_pointer(connection, xcb_aux_get_screen(globalconf.connection, screen_nbr)->root);
if(!(wa_r = xcb_get_window_attributes_reply(connection, wa_c, NULL))) if(!(wa_r = xcb_get_window_attributes_reply(connection, wa_c, NULL)))
return -1; return -1;
@ -414,12 +414,29 @@ event_handle_maprequest(void *data __attribute__ ((unused)),
return 0; return 0;
} }
if(!(c = client_get_bywin(globalconf.clients, ev->window)))
{
geom_c = xcb_get_geometry(connection, ev->window);
if(globalconf.screens_info->xinerama_is_active)
qp_c = xcb_query_pointer(connection, xcb_aux_get_screen(globalconf.connection,
screen_nbr)->root);
}
p_delete(&wa_r); p_delete(&wa_r);
if(!client_get_bywin(globalconf.clients, ev->window)) if(!c)
{ {
if(!(geom_r = xcb_get_geometry_reply(connection, geom_c, NULL))) if(!(geom_r = xcb_get_geometry_reply(connection, geom_c, NULL)))
{
if(globalconf.screens_info->xinerama_is_active)
{
qp_r = xcb_query_pointer_reply(connection, qp_c, NULL);
p_delete(&qp_r);
}
return -1; return -1;
}
if(globalconf.screens_info->xinerama_is_active if(globalconf.screens_info->xinerama_is_active
&& (qp_r = xcb_query_pointer_reply(connection, qp_c, NULL))) && (qp_r = xcb_query_pointer_reply(connection, qp_c, NULL)))