1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 05:18:06 +01:00

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

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

View File

@@ -45,9 +45,6 @@
#include "rootmenu.h"
#include "switchmenu.h"
/****** Global Variables ******/
extern XContext wWinContext;
#define MOD_MASK wPreferences.modifier_mask
@@ -1276,7 +1273,7 @@ static WMenu *findMenu(WScreen * scr, int *x_ret, int *y_ret)
if (win == None)
return NULL;
if (XFindContext(dpy, win, wWinContext, (XPointer *) & desc) == XCNOENT)
if (XFindContext(dpy, win, w_global.context.client_win, (XPointer *) & desc) == XCNOENT)
return NULL;
if (desc->parent_type == WCLASS_MENU) {
@@ -1398,7 +1395,7 @@ WMenu *wMenuUnderPointer(WScreen * screen)
if (win == None)
return NULL;
if (XFindContext(dpy, win, wWinContext, (XPointer *) & desc) == XCNOENT)
if (XFindContext(dpy, win, w_global.context.client_win, (XPointer *) & desc) == XCNOENT)
return NULL;
if (desc->parent_type == WCLASS_MENU)