[xutil] Remove map_raised
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
parent
82f305b1b1
commit
33709c62cd
|
@ -1348,15 +1348,14 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
compute_match(NULL);
|
compute_match(NULL);
|
||||||
|
|
||||||
redraw();
|
|
||||||
|
|
||||||
globalconf.keysyms = xcb_key_symbols_alloc(globalconf.connection);
|
globalconf.keysyms = xcb_key_symbols_alloc(globalconf.connection);
|
||||||
|
|
||||||
/* Get the numlock, capslock and shiftlock mask */
|
/* Get the numlock, capslock and shiftlock mask */
|
||||||
xutil_getlockmask(globalconf.connection, globalconf.keysyms, &globalconf.numlockmask,
|
xutil_getlockmask(globalconf.connection, globalconf.keysyms, &globalconf.numlockmask,
|
||||||
&globalconf.shiftlockmask, &globalconf.capslockmask);
|
&globalconf.shiftlockmask, &globalconf.capslockmask);
|
||||||
|
|
||||||
xutil_map_raised(globalconf.connection, globalconf.sw->window);
|
xcb_map_window(globalconf.connection, globalconf.sw->window);
|
||||||
|
redraw();
|
||||||
|
|
||||||
while(status == RUN)
|
while(status == RUN)
|
||||||
{
|
{
|
||||||
|
|
|
@ -220,9 +220,8 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
p_delete(&ctx);
|
p_delete(&ctx);
|
||||||
|
|
||||||
|
xcb_map_window(globalconf.connection, sw->window);
|
||||||
simplewindow_refresh_drawable(sw, globalconf.default_screen);
|
simplewindow_refresh_drawable(sw, globalconf.default_screen);
|
||||||
|
|
||||||
xutil_map_raised(globalconf.connection, sw->window);
|
|
||||||
xcb_aux_sync(globalconf.connection);
|
xcb_aux_sync(globalconf.connection);
|
||||||
|
|
||||||
signal(SIGALRM, &exit_on_signal);
|
signal(SIGALRM, &exit_on_signal);
|
||||||
|
|
|
@ -211,17 +211,6 @@ xutil_get_class_hint(xcb_connection_t *conn, xcb_window_t win)
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
xutil_map_raised(xcb_connection_t *conn, xcb_window_t win)
|
|
||||||
{
|
|
||||||
const uint32_t map_raised_val = XCB_STACK_MODE_ABOVE;
|
|
||||||
|
|
||||||
xcb_configure_window(conn, win, XCB_CONFIG_WINDOW_STACK_MODE,
|
|
||||||
&map_raised_val);
|
|
||||||
|
|
||||||
xcb_map_window(conn, win);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Number of different errors */
|
/* Number of different errors */
|
||||||
#define ERRORS_NBR 256
|
#define ERRORS_NBR 256
|
||||||
|
|
||||||
|
|
|
@ -104,10 +104,6 @@ class_hint_t *xutil_get_class_hint(xcb_connection_t *, xcb_window_t);
|
||||||
*/
|
*/
|
||||||
xcb_atom_t xutil_intern_atom(xcb_connection_t *, const char *);
|
xcb_atom_t xutil_intern_atom(xcb_connection_t *, const char *);
|
||||||
|
|
||||||
/* Equivalent XCB call to XMapRaised, which actually raises the
|
|
||||||
specified window to the top of the stack and maps it */
|
|
||||||
void xutil_map_raised(xcb_connection_t *, xcb_window_t);
|
|
||||||
|
|
||||||
/** Set the same handler for all errors */
|
/** Set the same handler for all errors */
|
||||||
void xutil_set_error_handler_catch_all(xcb_event_handlers_t *,
|
void xutil_set_error_handler_catch_all(xcb_event_handlers_t *,
|
||||||
xcb_generic_error_handler_t, void *);
|
xcb_generic_error_handler_t, void *);
|
||||||
|
|
5
mouse.c
5
mouse.c
|
@ -185,7 +185,8 @@ uicb_client_movemouse(int screen, char *arg __attribute__ ((unused)))
|
||||||
ctx = draw_context_new(globalconf.connection, sw->phys_screen,
|
ctx = draw_context_new(globalconf.connection, sw->phys_screen,
|
||||||
sw->geometry.width, sw->geometry.height,
|
sw->geometry.width, sw->geometry.height,
|
||||||
sw->drawable);
|
sw->drawable);
|
||||||
xutil_map_raised(globalconf.connection, sw->window);
|
|
||||||
|
xcb_map_window(globalconf.connection, sw->window);
|
||||||
mouse_resizebar_draw(ctx, style, sw, geometry, c->border);
|
mouse_resizebar_draw(ctx, style, sw, geometry, c->border);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -311,7 +312,7 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused)))
|
||||||
ctx = draw_context_new(globalconf.connection, sw->phys_screen,
|
ctx = draw_context_new(globalconf.connection, sw->phys_screen,
|
||||||
sw->geometry.width, sw->geometry.height,
|
sw->geometry.width, sw->geometry.height,
|
||||||
sw->drawable);
|
sw->drawable);
|
||||||
xutil_map_raised(globalconf.connection, sw->window);
|
xcb_map_window(globalconf.connection, sw->window);
|
||||||
mouse_resizebar_draw(ctx, style, sw, geometry, c->border);
|
mouse_resizebar_draw(ctx, style, sw, geometry, c->border);
|
||||||
}
|
}
|
||||||
else if (layout->arrange == layout_tile || layout->arrange == layout_tileleft
|
else if (layout->arrange == layout_tile || layout->arrange == layout_tileleft
|
||||||
|
|
|
@ -44,7 +44,7 @@ statusbar_position_update(Statusbar *statusbar)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
xutil_map_raised(globalconf.connection, statusbar->sw->window);
|
xcb_map_window(globalconf.connection, statusbar->sw->window);
|
||||||
|
|
||||||
/* Top and Bottom Statusbar have prio */
|
/* Top and Bottom Statusbar have prio */
|
||||||
if(statusbar->position == Top || statusbar->position == Bottom)
|
if(statusbar->position == Top || statusbar->position == Bottom)
|
||||||
|
|
Loading…
Reference in New Issue