From: Dana Jansens Date: Wed, 20 Aug 2003 15:50:12 +0000 (+0000) Subject: dont grab client context stuff on desktop windows. check that clint is non-null X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=9e3d680cf74f575ebe50d25588154a4f2f9550e9;p=chaz%2Fopenbox dont grab client context stuff on desktop windows. check that clint is non-null --- diff --git a/openbox/mouse.c b/openbox/mouse.c index 93d00784..82b124af 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -17,9 +17,9 @@ typedef struct { GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */ } ObMouseBinding; -#define CLIENT_CONTEXT(co, cl) (co == OB_FRAME_CONTEXT_CLIENT || \ - (co == OB_FRAME_CONTEXT_ROOT && \ - cl->type == OB_CLIENT_TYPE_DESKTOP)) +#define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \ + co == OB_FRAME_CONTEXT_ROOT : \ + co == OB_FRAME_CONTEXT_CLIENT) /* Array of GSList*s of PointerBinding*s. */ static GSList *bound_contexts[OB_FRAME_NUM_CONTEXTS];