summaryrefslogtreecommitdiff
path: root/winrules.c
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-09-14 11:24:26 +0200
committerDanny Baumann <dannybaumann@web.de>2007-09-14 11:24:26 +0200
commit63c5f37fbfd487d250a8f93af40ca520ab77dd16 (patch)
tree749f4ecd44c60c606994df899b851eaa4b5f488d /winrules.c
parenta07c0a79d27a754460e70bf0d8299f3959f3f712 (diff)
downloadwinrules-63c5f37fbfd487d250a8f93af40ca520ab77dd16.tar.gz
winrules-63c5f37fbfd487d250a8f93af40ca520ab77dd16.tar.bz2
Track core changes.
Diffstat (limited to 'winrules.c')
-rw-r--r--winrules.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/winrules.c b/winrules.c
index a2f6437..ce16134 100644
--- a/winrules.c
+++ b/winrules.c
@@ -486,21 +486,20 @@ winrulesHandleEvent (CompDisplay *d,
WRAP (wd, d, handleEvent, winrulesHandleEvent);
}
-static unsigned int
-winrulesGetAllowedActionsForWindow (CompWindow *w)
+static void
+winrulesGetAllowedActionsForWindow (CompWindow *w,
+ unsigned int *setActions,
+ unsigned int *clearActions)
{
- unsigned int actions;
-
WINRULES_SCREEN (w->screen);
WINRULES_WINDOW (w);
UNWRAP (ws, w->screen, getAllowedActionsForWindow);
- actions = (*w->screen->getAllowedActionsForWindow) (w);
+ (*w->screen->getAllowedActionsForWindow) (w, setActions, clearActions);
WRAP (ws, w->screen, getAllowedActionsForWindow,
winrulesGetAllowedActionsForWindow);
- return actions & ww->allowedActions;
-
+ *clearActions |= ~ww->allowedActions;
}
static Bool