awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[window] Fix possible memleak in window_setshape(), and remove useless ungrab() 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-04-30 11:01:42 +02:00
parent b142264787
commit 4473a25234
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
window.c
View File

@ -50,7 +50,7 @@ window_setstate(xcb_window_t win, long state)
/** Get a window state (WM_STATE). /** Get a window state (WM_STATE).
* \param w A client window. * \param w A client window.
* \return The current state of the window. * \return The current state of the window, or -1 on error.
*/ */
long long
window_getstate(xcb_window_t w) window_getstate(xcb_window_t w)
@ -180,9 +180,6 @@ window_root_grabkeys(int phys_screen)
keybinding_t *k; keybinding_t *k;
xcb_keycode_t kc; xcb_keycode_t kc;
/* Ungrab everything */
xcb_ungrab_key(globalconf.connection, ANY_KEY, s->root, ANY_MODIFIER);
for(k = globalconf.keys; k; k = k->next) for(k = globalconf.keys; k; k = k->next)
if((kc = k->keycode) || (k->keysym && (kc = xcb_key_symbols_get_keycode(globalconf.keysyms, k->keysym)))) if((kc = k->keycode) || (k->keysym && (kc = xcb_key_symbols_get_keycode(globalconf.keysyms, k->keysym))))
{ {
@ -211,14 +208,12 @@ window_setshape(xcb_window_t win, int phys_screen)
if((r = xcb_shape_query_extents_reply(globalconf.connection, if((r = xcb_shape_query_extents_reply(globalconf.connection,
xcb_shape_query_extents_unchecked(globalconf.connection, win), xcb_shape_query_extents_unchecked(globalconf.connection, win),
NULL)) && r->bounding_shaped) NULL)) && r->bounding_shaped)
{
xcb_shape_combine(globalconf.connection, XCB_SHAPE_SO_SET, xcb_shape_combine(globalconf.connection, XCB_SHAPE_SO_SET,
XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING, XCB_SHAPE_SK_BOUNDING,
xcb_aux_get_screen(globalconf.connection, phys_screen)->root, xcb_aux_get_screen(globalconf.connection, phys_screen)->root,
0, 0, win); 0, 0, win);
p_delete(&r); p_delete(&r);
}
} }
/** Set transparency of a window. /** Set transparency of a window.