gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 21:38:00 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: Moved definition of X Contexts into the global variables structure

Browse Source
This commit is contained in:
Christophe CURIS
2013-09-29 13:22:58 +02:00
committed by Carlos R. Mafra
parent e2ce62eb5b
commit ec91b9f68e
12 changed files with 35 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/application.c
View File

@@ -37,10 +37,6 @@
#include "dock.h"
#include "defaults.h"
/******** Global variables ********/
extern XContext wAppWinContext;
extern XContext wWinContext;
/******** Local variables ********/
@@ -73,7 +69,7 @@ WApplication *wApplicationOf(Window window)
if (window == None)
return NULL;
if (XFindContext(dpy, window, wAppWinContext, (XPointer *) & wapp) != XCSUCCESS)
if (XFindContext(dpy, window, w_global.context.app_win, (XPointer *) & wapp) != XCSUCCESS)
return NULL;
return wapp;
}
@@ -140,7 +136,7 @@ WApplication *wApplicationCreate(WWindow * wwin)
wapp->flags.emulated = WFLAGP(wapp->main_window_desc, emulate_appicon);
/* application descriptor */
XSaveContext(dpy, main_window, wAppWinContext, (XPointer) wapp);
XSaveContext(dpy, main_window, w_global.context.app_win, (XPointer) wapp);
create_appicon_for_application(wapp, wwin);
@@ -183,7 +179,7 @@ void wApplicationDestroy(WApplication * wapp)
wapp->prev->next = wapp->next;
}
XDeleteContext(dpy, wapp->main_window, wAppWinContext);
XDeleteContext(dpy, wapp->main_window, w_global.context.app_win);
wAppMenuDestroy(wapp->menu);
/* Remove application icon */
@@ -195,7 +191,7 @@ void wApplicationDestroy(WApplication * wapp)
if (wwin) {
/* undelete client window context that was deleted in
* wWindowDestroy */
XSaveContext(dpy, wwin->client_win, wWinContext, (XPointer) & wwin->client_descriptor);
XSaveContext(dpy, wwin->client_win, w_global.context.client_win, (XPointer) & wwin->client_descriptor);
}
wfree(wapp);
}