Merge lp:~smspillaz/compiz-core/compiz-core.cleanup-modifierhandler into lp:compiz-core/0.9.5

[Sam Spilsbury]

Clean up the ModifierHandler class , remove #define, remove duplication etc etc

Unmerged revisions

2953. By Sam Spilsbury on 2012-01-24

Clean up ModifierHandler

2952. By Sam Spilsbury on 2012-01-24

Break the dependency of CompAction and CompScreen - use ModifierHandler instead

2951. By Sam Spilsbury on 2012-01-24

Assorted cleanups - remove header dependencies from ModifierHandler and PropertyWriter

=== modified file 'include/core/abiversion.h'
--- include/core/abiversion.h	2012-01-24 04:59:15 +0000
+++ include/core/abiversion.h	2012-01-24 08:23:10 +0000
@@ -7,4 +7,22 @@
 
 #define CORE_ABIVERSION 20120124
 
+/*
+ * WORDS_BIGENDIAN should be defined before including this file for
+ * IMAGE_BYTE_ORDER and BITMAP_BIT_ORDER to be set correctly.
+ */
+#define LSBFirst 0
+#define MSBFirst 1
+
+#ifdef WORDS_BIGENDIAN
+#  define IMAGE_BYTE_ORDER MSBFirst
+#  define BITMAP_BIT_ORDER MSBFirst
+#else
+#  define IMAGE_BYTE_ORDER LSBFirst
+#  define BITMAP_BIT_ORDER LSBFirst
+#endif
+
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY (x)
+
 #endif // COMPIZ_ABIVERSION_H

=== modified file 'include/core/action.h'
--- include/core/action.h	2012-01-24 05:22:38 +0000
+++ include/core/action.h	2012-01-24 08:23:10 +0000
@@ -29,31 +29,13 @@
 #define _COMPACTION_H
 
 #include <core/option.h>
+#include <core/modifierhandler.h>
 
 #include <boost/function.hpp>
 
 
 class PrivateAction;
 
-#define CompModAlt        0
-#define CompModMeta       1
-#define CompModSuper      2
-#define CompModHyper      3
-#define CompModModeSwitch 4
-#define CompModNumLock    5
-#define CompModScrollLock 6
-#define CompModNum        7
-
-#define CompAltMask        (1 << 16)
-#define CompMetaMask       (1 << 17)
-#define CompSuperMask      (1 << 18)
-#define CompHyperMask      (1 << 19)
-#define CompModeSwitchMask (1 << 20)
-#define CompNumLockMask    (1 << 21)
-#define CompScrollLockMask (1 << 22)
-
-#define CompNoMask         (1 << 25)
-
 /**
  * Context of an event occuring.
  */

=== modified file 'include/core/core.h'
--- include/core/core.h	2012-01-24 04:58:35 +0000
+++ include/core/core.h	2012-01-24 08:23:10 +0000
@@ -51,30 +51,6 @@
 typedef XBool Bool;
 #endif
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#define foreach BOOST_FOREACH
-
-
-/*
- * WORDS_BIGENDIAN should be defined before including this file for
- * IMAGE_BYTE_ORDER and BITMAP_BIT_ORDER to be set correctly.
- */
-#define LSBFirst 0
-#define MSBFirst 1
-
-#ifdef WORDS_BIGENDIAN
-#  define IMAGE_BYTE_ORDER MSBFirst
-#  define BITMAP_BIT_ORDER MSBFirst
-#else
-#  define IMAGE_BYTE_ORDER LSBFirst
-#  define BITMAP_BIT_ORDER LSBFirst
-#endif
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY (x)
-
 #include <core/global.h>
 
 #include <core/pluginclasses.h>

=== modified file 'include/core/modifierhandler.h'
--- include/core/modifierhandler.h	2010-03-24 09:37:19 +0000
+++ include/core/modifierhandler.h	2012-01-24 08:23:10 +0000
@@ -26,22 +26,19 @@
  *	    Sam Spilsbury <[e-mail]>
  */
 
-#include <core/core.h>
-
-/**
- * Toplevel class which provides access to display
- * level modifier information
- */
-class ModifierHandler
+#ifndef _COMPIZ_MODIFIERHANDLER_H
+#define _COMPIZ_MODIFIERHANDLER_H
+
+#include <X11/Xlib-xcb.h>
+#include <string>
+
+namespace compiz
 {
-    public:
-
-	ModifierHandler ();
-	~ModifierHandler ();
-
+    namespace modifiers
+    {
 	typedef enum
 	{
-	    Alt = 1,
+	    Alt = 0,
 	    Meta,
 	    Super,
 	    Hyper,
@@ -63,52 +60,76 @@
 	    NoMask         = (1 << 25),
 	} ModMask;
 
-    public:
-
-
-	/**
-	 * Takes an X11 Keycode and returns a bitmask
-	 * with modifiers that have been pressed
-	 */
-	unsigned int keycodeToModifiers (int keycode);
-
-	/**
-	 * Updates X11 Modifier mappings
-	 */
-	void updateModifierMappings ();
-
-	/**
-	 * Takes a virtual modMask and returns a real modifier mask
-	 * by removing unused bits
-	 */
-	unsigned int virtualToRealModMask (unsigned int modMask);
-
-	/**
-	 * Returns a bit modifier mask for a Motifier enum
-	 */
-	unsigned int modMask (Modifier);
-
-	/**
-	 * Returns a const bit modifier mask for what should be ignored
-	 */
-	unsigned int ignoredModMask ();
-
-	/**
-	 * Returns a const XModifierKeymap for compiz
-	 */
-	const XModifierKeymap * modMap ();
-
-	friend class CompScreen;
-
-    private:
-
-	static const unsigned int virtualModMask[7];
-
-	static const int maskTable[8];
-
-	static const int maskTableSize = 8;
-
-	ModMask    mModMask[ModNum];
-	unsigned int    mIgnoredModMask;
-	XModifierKeymap *mModMap;
-};
+	/**
+	 * Toplevel class which provides access to display
+	 * level modifier information
+	 */
+	class ModifierHandler
+	{
+	    public:
+
+		ModifierHandler (Display *);
+		~ModifierHandler ();
+
+	    public:
+
+
+		/**
+		 * Takes an X11 Keycode and returns a bitmask
+		 * with modifiers that have been pressed
+		 */
+		unsigned int keycodeToModifiers (int keycode);
+
+		/**
+		 * Updates X11 Modifier mappings
+		 */
+		bool updateModifierMappings ();
+
+		/**
+		 * Takes a virtual modMask and returns a real modifier mask
+		 * by removing unused bits
+		 */
+		unsigned int virtualToRealModMask (unsigned int modMask);
+
+		/**
+		 * Takes a key string and returns a keycode
+		 */
+		int stringToKeycode (const std::string &) const;
+
+		/**
+		 * Takes a keycode and returns a key string
+		 */
+		std::string keycodeToString (int keycode) const;
+
+		/**
+		 * Returns a bit modifier mask for a Motifier enum
+		 */
+		unsigned int modMask (Modifier);
+
+		/**
+		 * Returns a const bit modifier mask for what should be ignored
+		 */
+		unsigned int ignoredModMask ();
+
+		/**
+		 * Returns a const XModifierKeymap for compiz
+		 */
+		const XModifierKeymap * modMap ();
+
+		static ModifierHandler *
+		Default ();
+
+		static void
+		SetDefault (ModifierHandler *);
+	    private:
+
+		ModMask    mModMask[ModNum];
+		unsigned int    mIgnoredModMask;
+		XModifierKeymap *mModMap;
+
+		Display    *mDisplay;
+	};
+    }
+}
+
+#endif

=== modified file 'include/core/propertywriter.h'
--- include/core/propertywriter.h	2012-01-18 16:26:45 +0000
+++ include/core/propertywriter.h	2012-01-24 08:23:10 +0000
@@ -30,7 +30,7 @@
 #include "core/string.h"
 
 #include <X11/Xatom.h>
-#include <X11/X.h>
+#include <X11/Xlib-xcb.h>
 
 static const CompOption::Vector nilValues;
 
@@ -48,6 +48,8 @@
 	void setReadTemplate (const CompOption::Vector &);
 	const CompOption::Vector & getReadTemplate ();
 
+	static void connect (Display *);
+
     private:
 
 	CompOption::Vector mPropertyValues;

=== modified file 'include/core/screen.h'
--- include/core/screen.h	2012-01-24 04:58:35 +0000
+++ include/core/screen.h	2012-01-24 08:23:10 +0000
@@ -28,6 +28,12 @@
 #ifndef _COMPSCREEN_H
 #define _COMPSCREEN_H
 
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#define foreach BOOST_FOREACH
+
+#include <core/abiversion.h>
 #include <core/window.h>
 #include <core/output.h>
 #include <core/session.h>
@@ -38,6 +44,9 @@
 #include <core/modifierhandler.h>
 #include <core/valueholder.h>
 #include <core/actionbindings.h>
+#include <core/plugin.h>
+
+#include <X11/extensions/Xinerama.h>
 
 class CompScreen;
 class PrivateScreen;
@@ -53,7 +62,6 @@
 extern bool       debugOutput;
 
 extern CompScreen   *screen;
-extern ModifierHandler *modHandler;
 
 extern int lastPointerX;
 extern int lastPointerY;

=== modified file 'plugins/inotify/src/inotify.cpp'
--- plugins/inotify/src/inotify.cpp	2012-01-18 16:26:45 +0000
+++ plugins/inotify/src/inotify.cpp	2012-01-24 08:23:10 +0000
@@ -30,6 +30,8 @@
 #include <poll.h>
 #include <sys/inotify.h>
 
+#include <cstdio>
+#include <boost/bind.hpp>
 
 COMPIZ_PLUGIN_20090315 (inotify, InotifyPluginVTable)
 

=== modified file 'plugins/regex/src/regexplugin.h'
--- plugins/regex/src/regexplugin.h	2012-01-18 16:26:45 +0000
+++ plugins/regex/src/regexplugin.h	2012-01-24 08:23:10 +0000
@@ -26,8 +26,10 @@
 #ifndef COMPIZ_REGEXPLUGIN_H
 #define COMPIZ_REGEXPLUGIN_H
 
+#include <core/core.h>
 #include <core/screen.h>
 #include <core/pluginclasshandler.h>
+#include <core/timer.h>
 
 #include <X11/Xatom.h>
 

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2012-01-18 16:26:45 +0000
+++ plugins/resize/src/resize.cpp	2012-01-24 08:23:10 +0000
@@ -32,8 +32,11 @@
 #include <X11/cursorfont.h>
 
 #include <core/atoms.h>
+#include <core/modifierhandler.h>
 #include "resize.h"
 
+using namespace compiz::modifiers;
+
 COMPIZ_PLUGIN_20090315 (resize, ResizePluginVTable)
 
 void
@@ -1713,11 +1716,11 @@
     if (valueMask & ResizeModeShiftMask)
 	*mask |= ShiftMask;
     if (valueMask & ResizeModeAltMask)
-	*mask |= CompAltMask;
+	*mask |= AltMask;
     if (valueMask & ResizeModeControlMask)
 	*mask |= ControlMask;
     if (valueMask & ResizeModeMetaMask)
-	*mask |= CompMetaMask;
+	*mask |= MetaMask;
 }
 
 void

=== modified file 'src/action.cpp'
--- src/action.cpp	2012-01-24 05:22:38 +0000
+++ src/action.cpp	2012-01-24 08:23:10 +0000
@@ -33,12 +33,12 @@
 #include "privateaction.h"
 #include "privatescreen.h"
 
-#include <X11/Xlib-xcb.h>
+using namespace compiz;
 
 struct _Modifier {
     const char *name;
     int        modifier;
-} modifiers[] = {
+} allModifiers[] = {
     { "<Shift>",      ShiftMask		 },
     { "<Control>",    ControlMask	 },
     { "<Mod1>",	      Mod1Mask		 },
@@ -46,14 +46,14 @@
     { "<Mod3>",	      Mod3Mask		 },
     { "<Mod4>",	      Mod4Mask		 },
     { "<Mod5>",	      Mod5Mask		 },
-    { "<Alt>",	      CompAltMask        },
-    { "<Meta>",	      CompMetaMask       },
-    { "<Super>",      CompSuperMask      },
-    { "<Hyper>",      CompHyperMask	 },
-    { "<ModeSwitch>", CompModeSwitchMask }
+    { "<Alt>",	      modifiers::AltMask		 },
+    { "<Meta>",	      modifiers::MetaMask           },
+    { "<Super>",      modifiers::SuperMask          },
+    { "<Hyper>",      modifiers::HyperMask	         },
+    { "<ModeSwitch>", modifiers::ModeSwitchMask     }
 };
 
-#define N_MODIFIERS (sizeof (modifiers) / sizeof (struct _Modifier))
+#define N_MODIFIERS (sizeof (allModifiers) / sizeof (struct _Modifier))
 
 struct _Edge {
     const char *name;
@@ -76,8 +76,8 @@
 
     for (unsigned int i = 0; i < N_MODIFIERS; i++)
     {
-	if (modMask & modifiers[i].modifier)
-	    binding += modifiers[i].name;
+	if (modMask & allModifiers[i].modifier)
+	    binding += allModifiers[i].name;
     }
 
     return binding;
@@ -90,8 +90,8 @@
 
     for (unsigned int i = 0; i < N_MODIFIERS; i++)
     {
-	if (str.find (modifiers[i].name) != std::string::npos)
-	    mods |= modifiers[i].modifier;
+	if (str.find (allModifiers[i].name) != std::string::npos)
+	    mods |= allModifiers[i].modifier;
     }
 
     return mods;
@@ -158,7 +158,7 @@
     CompString   sStr;
     unsigned int mods;
     size_t       pos, start = 0;
-    KeySym	 keysym;
+    int          keycode;
 
     if (!screen)
 	return false;
@@ -186,31 +186,25 @@
     }
 
     sStr   = str.substr (start);
-    keysym = XStringToKeysym (sStr.c_str ());
+    keycode = modifiers::ModifierHandler::Default ()->stringToKeycode (sStr);
 
-    if (keysym != NoSymbol)
+    if (!keycode)
     {
-	KeyCode keycode;
-
-	keycode = XKeysymToKeycode (screen->dpy (), keysym);
-	if (keycode)
+	if (sStr.compare (0, 2, "0x") == 0)
 	{
-	    mKeycode   = keycode;
+	    mKeycode   = strtol (sStr.c_str (), NULL, 0);
 	    mModifiers = mods;
 
 	    return true;
 	}
-    }
-
-    if (sStr.compare (0, 2, "0x") == 0)
-    {
-	mKeycode   = strtol (sStr.c_str (), NULL, 0);
-	mModifiers = mods;
-
-	return true;
-    }
-
-    return false;
+	else
+	    return false;
+    }
+
+    mModifiers = mods;
+    mKeycode = keycode;
+
+    return true;
 }
 
 CompString
@@ -225,13 +219,9 @@
 
     if (mKeycode != 0)
     {
-	KeySym keysym;
-	char   *keyname;
-
-	keysym  = XKeycodeToKeysym (screen->dpy (), mKeycode, 0);
-	keyname = XKeysymToString (keysym);
-
-	if (keyname)
+	std::string keyname (modifiers::ModifierHandler::Default ()->keycodeToString (mKeycode));
+
+	if (!keyname.empty ())
 	    binding += keyname;
 	else
 	    binding += compPrintf ("0x%x", mKeycode);

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-01-19 18:12:31 +0000
+++ src/event.cpp	2012-01-24 08:23:10 +0000
@@ -37,10 +37,13 @@
 #include <X11/extensions/Xfixes.h>
 
 #include <core/atoms.h>
+#include <core/modifierhandler.h>
 #include "privatescreen.h"
 #include "privatewindow.h"
 #include "privatestackdebugger.h"
 
+using namespace compiz::modifiers;
+
 bool
 PrivateWindow::handleSyncAlarm ()
 {
@@ -80,8 +83,10 @@
     return false;
 }
 
-#define REAL_MOD_MASK (ShiftMask | ControlMask | Mod1Mask | Mod2Mask | \
-		       Mod3Mask | Mod4Mask | Mod5Mask | CompNoMask)
+const unsigned int REAL_MOD_MASK = (ShiftMask | ControlMask |
+				    Mod1Mask | Mod2Mask |
+				    Mod3Mask | Mod4Mask |
+				    Mod5Mask | compiz::modifiers::NoMask);
 
 static bool
 isCallBackBinding (CompOption	           &option,
@@ -141,7 +146,7 @@
 {
     CompAction::State state = CompAction::StateInitButton;
     CompAction        *action;
-    unsigned int      ignored = modHandler->ignoredModMask ();
+    unsigned int      ignored = ModifierHandler::Default ()->ignoredModMask ();
     unsigned int      modMask = REAL_MOD_MASK & ~ignored;
     unsigned int      bindMods;
     unsigned int      edge = 0;
@@ -177,7 +182,7 @@
 	{
 	    if (action->button ().button () == (int) event->button)
 	    {
-		bindMods = modHandler->virtualToRealModMask (
+		bindMods = ModifierHandler::Default ()->virtualToRealModMask (
 		    action->button ().modifiers ());
 
 		if ((bindMods & modMask) == (event->state & modMask))
@@ -196,7 +201,7 @@
 		if ((action->button ().button () == (int) event->button) &&
 		    (action->edgeMask () & edge))
 		{
-		    bindMods = modHandler->virtualToRealModMask (
+		    bindMods = ModifierHandler::Default ()->virtualToRealModMask (
 			action->button ().modifiers ());
 
 		    if ((bindMods & modMask) == (event->state & modMask))
@@ -244,7 +249,7 @@
 {
     CompAction::State state = 0;
     CompAction	      *action;
-    unsigned int      modMask = REAL_MOD_MASK & ~modHandler->ignoredModMask ();
+    unsigned int      modMask = REAL_MOD_MASK & ~ModifierHandler::Default ()->ignoredModMask ();
     unsigned int      bindMods;
 
     if (event->keycode == escapeKeyCode)
@@ -274,7 +279,7 @@
 	if (isInitiateBinding (option, CompAction::BindingTypeKey,
 			       state, &action))
 	{
-	    bindMods = modHandler->virtualToRealModMask (
+	    bindMods = ModifierHandler::Default ()->virtualToRealModMask (
 		action->key ().modifiers ());
 
 	    if (action->key ().keycode () == (int) event->keycode)
@@ -302,12 +307,12 @@
 {
     CompAction::State state = CompAction::StateTermKey;
     CompAction        *action;
-    unsigned int      ignored = modHandler->ignoredModMask ();
+    unsigned int      ignored = ModifierHandler::Default ()->ignoredModMask ();
     unsigned int      modMask = REAL_MOD_MASK & ~ignored;
     unsigned int      bindMods;
     unsigned int      mods;
 
-    mods = modHandler->keycodeToModifiers (event->keycode);
+    mods = ModifierHandler::Default ()->keycodeToModifiers (event->keycode);
     if (!xkbEvent && !mods)
 	return false;
 
@@ -316,7 +321,7 @@
 	if (isTerminateBinding (option, CompAction::BindingTypeKey,
 				state, &action))
 	{
-	    bindMods = modHandler->virtualToRealModMask (action->key ().modifiers ());
+	    bindMods = ModifierHandler::Default ()->virtualToRealModMask (action->key ().modifiers ());
 
 	    if ((bindMods & modMask) == 0)
 	    {
@@ -345,7 +350,7 @@
 {
     CompAction::State state;
     CompAction        *action;
-    unsigned int      ignored = modHandler->ignoredModMask ();
+    unsigned int      ignored = ModifierHandler::Default ()->ignoredModMask ();
     unsigned int      modMask = REAL_MOD_MASK & ~ignored;
     unsigned int      bindMods;
 
@@ -361,7 +366,7 @@
 		if (action->key ().keycode () == 0)
 		{
 		    bindMods =
-			modHandler->virtualToRealModMask (action->key ().modifiers ());
+			ModifierHandler::Default ()->virtualToRealModMask (action->key ().modifiers ());
 
 		    if ((event->mods & modMask & bindMods) == bindMods)
 		    {
@@ -381,7 +386,7 @@
 	    if (isTerminateBinding (option, CompAction::BindingTypeKey,
 				    state, &action))
 	    {
-		bindMods = modHandler->virtualToRealModMask (action->key ().modifiers ());
+		bindMods = ModifierHandler::Default ()->virtualToRealModMask (action->key ().modifiers ());
 
 		if ((event->mods & modMask & bindMods) != bindMods)
 		{
@@ -1709,7 +1714,12 @@
 	}
 	break;
     case MappingNotify:
-	modHandler->updateModifierMappings ();
+	if (ModifierHandler::Default ()->updateModifierMappings ())
+	{
+	    priv->updatePassiveKeyGrabs ();
+	    foreach (CompWindow *w, screen->windows ())
+		w->priv->updatePassiveButtonGrabs ();
+	}
 	break;
     case MapRequest:
 	w = screen->findWindow (event->xmaprequest.window);

=== modified file 'src/main.cpp'
--- src/main.cpp	2012-01-23 17:45:39 +0000
+++ src/main.cpp	2012-01-24 08:23:10 +0000
@@ -172,11 +172,6 @@
 	return false;
     }
 
-    modHandler = new ModifierHandler ();
-
-    if (!modHandler)
-	return false;
-
     if (!plugins.empty ())
     {
 	CompOption::Value::Vector list;
@@ -239,7 +234,6 @@
     StackDebugger::SetDefault (NULL);
 
     delete screen;
-    delete modHandler;
 }
 
 

=== modified file 'src/modifierhandler.cpp'
--- src/modifierhandler.cpp	2011-01-07 20:06:40 +0000
+++ src/modifierhandler.cpp	2012-01-24 08:23:10 +0000
@@ -26,19 +26,35 @@
  *	    Sam Spilsbury <[e-mail]>
  */
 
-#include <core/screen.h>
-#include "privatescreen.h"
-#include "privatewindow.h"
-
-const unsigned int ModifierHandler::virtualModMask[7] = {
-            CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask,
-            CompModeSwitchMask, CompNumLockMask, CompScrollLockMask
-};
-
-const int ModifierHandler::maskTable[8] = {
-	    ShiftMask, LockMask, ControlMask, Mod1Mask,
-	    Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
-};
+#include <core/modifierhandler.h>
+#include <assert.h>
+#include <X11/keysym.h>
+#include <cstring>
+
+using namespace compiz;
+
+typedef modifiers::ModifierHandler ModifierHandler;
+
+namespace
+{
+
+const unsigned int virtualModMask[7] = {
+    modifiers::AltMask,
+    modifiers::MetaMask,
+    modifiers::SuperMask,
+    modifiers::HyperMask,
+    modifiers::ModeSwitchMask,
+    modifiers::NumLockMask,
+    modifiers::ScrollLockMask
+};
+const int maskTable[8] = {
+    ShiftMask, LockMask, ControlMask, Mod1Mask,
+    Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
+};
+const int maskTableSize = 8;
+
+ModifierHandler *gDefault = NULL;
+}
 
 unsigned int
 ModifierHandler::ignoredModMask ()
@@ -52,25 +68,25 @@
     return mModMap;
 }
 
-void
+bool
 ModifierHandler::updateModifierMappings ()
 {
-    unsigned int    modMask[CompModNum];
-    int		    i, minKeycode, maxKeycode, keysymsPerKeycode = 0;
+    unsigned int    modMask[modifiers::ModNum];
+    int		    minKeycode, maxKeycode, keysymsPerKeycode = 0;
     KeySym*         key;
 
-    for (i = 0; i < CompModNum; i++)
+    for (unsigned int i = 0; i < modifiers::ModNum; i++)
 	modMask[i] = 0;
 
-    XDisplayKeycodes (screen->dpy (), &minKeycode, &maxKeycode);
-    key = XGetKeyboardMapping (screen->dpy (),
+    XDisplayKeycodes (mDisplay, &minKeycode, &maxKeycode);
+    key = XGetKeyboardMapping (mDisplay,
 			       minKeycode, (maxKeycode - minKeycode + 1),
 			       &keysymsPerKeycode);
 
     if (mModMap)
 	XFreeModifiermap (mModMap);
 
-    mModMap = XGetModifierMapping (screen->dpy ());
+    mModMap = XGetModifierMapping (mDisplay);
     if (mModMap && mModMap->max_keypermod > 0)
     {
 	KeySym keysym;
@@ -78,7 +94,7 @@
 
 	size = maskTableSize * mModMap->max_keypermod;
 
-	for (i = 0; i < size; i++)
+	for (int i = 0; i < size; i++)
 	{
 	    if (!mModMap->modifiermap[i])
 		continue;
@@ -86,7 +102,7 @@
 	    index = 0;
 	    do
 	    {
-		keysym = XKeycodeToKeysym (screen->dpy (),
+		keysym = XKeycodeToKeysym (mDisplay,
 					   mModMap->modifiermap[i],
 					   index++);
 	    } while (!keysym && index < keysymsPerKeycode);
@@ -98,42 +114,42 @@
 		if (keysym == XK_Alt_L ||
 		    keysym == XK_Alt_R)
 		{
-		    modMask[CompModAlt] |= mask;
+		    modMask[modifiers::Alt] |= mask;
 		}
 		else if (keysym == XK_Meta_L ||
 			 keysym == XK_Meta_R)
 		{
-		    modMask[CompModMeta] |= mask;
+		    modMask[modifiers::Meta] |= mask;
 		}
 		else if (keysym == XK_Super_L ||
 			 keysym == XK_Super_R)
 		{
-		    modMask[CompModSuper] |= mask;
+		    modMask[modifiers::Super] |= mask;
 		}
 		else if (keysym == XK_Hyper_L ||
 			 keysym == XK_Hyper_R)
 		{
-		    modMask[CompModHyper] |= mask;
+		    modMask[modifiers::Hyper] |= mask;
 		}
 		else if (keysym == XK_Mode_switch)
 		{
-		    modMask[CompModModeSwitch] |= mask;
+		    modMask[modifiers::ModeSwitch] |= mask;
 		}
 		else if (keysym == XK_Scroll_Lock)
 		{
-		    modMask[CompModScrollLock] |= mask;
+		    modMask[modifiers::ScrollLock] |= mask;
 		}
 		else if (keysym == XK_Num_Lock)
 		{
-		    modMask[CompModNumLock] |= mask;
+		    modMask[modifiers::NumLock] |= mask;
 		}
 	    }
 	}
 
-	for (i = 0; i < CompModNum; i++)
+	for (unsigned int i = 0; i < modifiers::ModNum; i++)
 	{
 	    if (!modMask[i])
-		modMask[i] = CompNoMask;
+		modMask[i] = modifiers::NoMask;
 	}
 
 	if (memcmp (modMask, mModMask, sizeof (modMask)))
@@ -141,25 +157,23 @@
 	    memcpy (mModMask, modMask, sizeof (modMask));
 
 	    mIgnoredModMask = LockMask |
-		(modMask[CompModNumLock]    & ~CompNoMask) |
-		(modMask[CompModScrollLock] & ~CompNoMask);
-
-	    screen->priv->updatePassiveKeyGrabs ();
-	    foreach (CompWindow *w, screen->windows ())
-		w->priv->updatePassiveButtonGrabs ();
+		(modMask[modifiers::NumLock]    & ~modifiers::NoMask) |
+		(modMask[modifiers::ScrollLock] & ~modifiers::NoMask);
+
+	    if (key)
+		XFree (key);
+
+	    return true;
 	}
     }
 
-    if (key)
-	XFree (key);
+    return false;
 }
 
 unsigned int
 ModifierHandler::virtualToRealModMask (unsigned int modMask)
 {
-    int i;
-
-    for (i = 0; i < CompModNum; i++)
+    for (unsigned int i = 0; i < modifiers::ModNum; i++)
     {
 	if (modMask & virtualModMask[i])
 	{
@@ -190,11 +204,48 @@
     return mods;
 }
 
-ModifierHandler::ModifierHandler () :
+int
+ModifierHandler::stringToKeycode (const std::string &str) const
+{
+    KeySym keysym = XStringToKeysym (str.c_str ());
+
+    if (keysym != NoSymbol)
+	return static_cast <int> (XKeysymToKeycode (mDisplay, keysym));
+
+    return 0;
+}
+
+std::string
+ModifierHandler::keycodeToString (int keycode) const
+{
+    KeySym keysym;
+    std::string keyname;
+
+    keysym  = XKeycodeToKeysym (mDisplay, keycode, 0);
+    keyname = std::string (XKeysymToString (keysym));
+
+    return keyname;
+}
+
+ModifierHandler *
+ModifierHandler::Default ()
+{
+    return gDefault;
+}
+
+void
+ModifierHandler::SetDefault (ModifierHandler *m)
+{
+    assert (!gDefault);
+    gDefault = m;
+}
+
+ModifierHandler::ModifierHandler (Display *display) :
     mIgnoredModMask (LockMask),
-    mModMap (0)
+    mModMap (0),
+    mDisplay (display)
 {
-    for (int i = 0; i < ModNum; i++)
+    for (int i = 0; i < modifiers::ModNum; i++)
 	mModMask[i] = NoMask;
 }
 

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-01-21 13:34:31 +0000
+++ src/privatescreen.h	2012-01-24 08:23:10 +0000
@@ -407,6 +407,8 @@
 	std::list< CompWatchFd * > watchFds;
 	CompWatchFdHandle        lastWatchFdHandle;
 
+	compiz::modifiers::ModifierHandler          *modHandler;
+
 	std::map<CompString, CompPrivate> valueMap;
 
 	xcb_connection_t *connection;

=== modified file 'src/propertywriter.cpp'
--- src/propertywriter.cpp	2012-01-18 16:26:45 +0000
+++ src/propertywriter.cpp	2012-01-24 08:23:10 +0000
@@ -23,8 +23,28 @@
  * Authors: Sam Spilsbury <[e-mail]>
  */
 
+#include <core/match.h>
+#include <core/action.h>
 #include <core/propertywriter.h>
-#include <core/screen.h>
+#include <boost/foreach.hpp>
+#include <X11/Xlib-xcb.h>
+#include <X11/Xutil.h>
+
+#ifndef foreach
+#define foreach BOOST_FOREACH
+#endif
+
+namespace
+{
+    Display *connection = NULL;
+}
+
+void
+PropertyWriter::connect (Display *display)
+{
+    assert (!connection);
+    connection = display;
+}
 
 PropertyWriter::PropertyWriter ()
 {
@@ -34,7 +54,7 @@
 				CompOption::Vector &readTemplate)
 {
     mPropertyValues = readTemplate;
-    mAtom = XInternAtom (screen->dpy (), propName.c_str (), 0);
+    mAtom = XInternAtom (connection, propName.c_str (), 0);
 }
 
 void
@@ -79,7 +99,7 @@
 	    count++;
         }
 
-        XChangeProperty (screen->dpy (), id,
+	XChangeProperty (connection, id,
 		         mAtom, type, 32,
 		         PropModeReplace,  (unsigned char *)data,
 		         propertyData.size ());
@@ -117,7 +137,7 @@
         {
 	    if (XStringListToTextProperty (data, count, &prop))
 	    {
-	        XSetTextProperty (screen->dpy (), id, &prop, mAtom);
+		XSetTextProperty (connection, id, &prop, mAtom);
 		XFree (prop.value);
 	    }
         }
@@ -129,7 +149,7 @@
 void
 PropertyWriter::deleteProperty (Window id)
 {
-    XDeleteProperty (screen->dpy (), id, mAtom);
+    XDeleteProperty (connection, id, mAtom);
 }
 
 const CompOption::Vector &
@@ -143,7 +163,7 @@
     if (mPropertyValues.empty ())
 	return mPropertyValues;
 
-    retval = XGetWindowProperty (screen->dpy (), id, mAtom, 0,
+    retval = XGetWindowProperty (connection, id, mAtom, 0,
     				 mPropertyValues.size (), False, XA_CARDINAL,
     				 &type, &fmt, &nitems, &exbyte,
     				 (unsigned char **)&data);
@@ -184,7 +204,7 @@
 	else if (type == XA_STRING && fmt == 8)
 	{
 	    XTextProperty tProp;
-	    retval = XGetTextProperty (screen->dpy (), id, &tProp, mAtom);
+	    retval = XGetTextProperty (connection, id, &tProp, mAtom);
 
 	    if (tProp.value)
 	    {

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-24 04:58:35 +0000
+++ src/screen.cpp	2012-01-24 08:23:10 +0000
@@ -55,11 +55,14 @@
 #include <core/screen.h>
 #include <core/icon.h>
 #include <core/atoms.h>
+#include <core/propertywriter.h>
 #include "privatescreen.h"
 #include "privatewindow.h"
 #include "privateaction.h"
 #include "privatestackdebugger.h"
 
+using namespace compiz::modifiers;
+
 bool inHandleEvent = false;
 
 bool screenInitalized = false;
@@ -87,7 +90,6 @@
 
 
 CompScreen *screen;
-ModifierHandler *modHandler;
 
 PluginClassStorage::Indices screenPluginClassIndices (0);
 
@@ -3010,9 +3012,9 @@
 
     CompScreen::checkForError (dpy);
 
-    for (ignore = 0; ignore <= modHandler->ignoredModMask (); ignore++)
+    for (ignore = 0; ignore <= ModifierHandler::Default ()->ignoredModMask (); ignore++)
     {
-	if (ignore & ~modHandler->ignoredModMask ())
+	if (ignore & ~ModifierHandler::Default ()->ignoredModMask ())
 	    continue;
 
 	if (keycode != 0)
@@ -3025,15 +3027,15 @@
 	    {
 		if (modifiers & (1 << mod))
 		{
-		    for (k = mod * modHandler->modMap ()->max_keypermod;
-			 k < (mod + 1) * modHandler->modMap ()->max_keypermod;
+		    for (k = mod * ModifierHandler::Default ()->modMap ()->max_keypermod;
+			 k < (mod + 1) * ModifierHandler::Default ()->modMap ()->max_keypermod;
 			 k++)
 		    {
-			if (modHandler->modMap ()->modifiermap[k])
+			if (ModifierHandler::Default ()->modMap ()->modifiermap[k])
 			{
 			    grabUngrabOneKey ((modifiers & ~(1 << mod)) |
 					      ignore,
-					      modHandler->modMap ()->modifiermap[k],
+					      ModifierHandler::Default ()->modMap ()->modifiermap[k],
 					      grab);
 			}
 		    }
@@ -3055,7 +3057,7 @@
     unsigned int                 mask;
     std::list<KeyGrab>::iterator it;
 
-    mask = modHandler->virtualToRealModMask (key.modifiers ());
+    mask = ModifierHandler::Default ()->virtualToRealModMask (key.modifiers ());
 
     for (it = keyGrabs.begin (); it != keyGrabs.end (); it++)
     {
@@ -3069,7 +3071,7 @@
 
 
 
-    if (!(mask & CompNoMask))
+    if (!(mask & compiz::modifiers::NoMask))
     {
 	if (!grabUngrabKeys (mask, key.keycode (), true))
 	    return false;
@@ -3090,7 +3092,7 @@
     unsigned int                 mask;
     std::list<KeyGrab>::iterator it;
 
-    mask = modHandler->virtualToRealModMask (key.modifiers ());
+    mask = ModifierHandler::Default ()->virtualToRealModMask (key.modifiers ());
 
     for (it = keyGrabs.begin (); it != keyGrabs.end (); it++)
     {
@@ -3103,7 +3105,7 @@
 
 	    it = keyGrabs.erase (it);
 
-	    if (!(mask & CompNoMask))
+	    if (!(mask & compiz::modifiers::NoMask))
 		grabUngrabKeys (mask, key.keycode (), false);
 	}
     }
@@ -3118,7 +3120,7 @@
 
     for (it = keyGrabs.begin (); it != keyGrabs.end (); it++)
     {
-	if (!((*it).modifiers & CompNoMask))
+	if (!((*it).modifiers & compiz::modifiers::NoMask))
 	{
 	    grabUngrabKeys ((*it).modifiers,
 			    (*it).keycode, true);
@@ -4401,6 +4403,11 @@
 	return false;
     }
 
+    priv->modHandler = new ModifierHandler (priv->dpy);
+
+    PropertyWriter::connect (priv->dpy);
+    ModifierHandler::SetDefault (priv->modHandler);
+
     XSynchronize (dpy, TRUE);
 
 //    priv->connection = XGetXCBConnection (priv->dpy);
@@ -4538,7 +4545,12 @@
 	} while (event.type != DestroyNotify);
     }
 
-    modHandler->updateModifierMappings ();
+    if (ModifierHandler::Default ()->updateModifierMappings ())
+    {
+	priv->updatePassiveKeyGrabs ();
+	foreach (CompWindow *w, screen->windows ())
+	    w->priv->updatePassiveButtonGrabs ();
+    }
 
     CompScreen::checkForError (dpy);
 
@@ -4966,6 +4978,7 @@
 {
     delete timeout;
     delete source;
+    delete modHandler;
 
     foreach (CompWatchFd *fd, watchFds)
 	delete fd;

=== modified file 'src/session.cpp'
--- src/session.cpp	2012-01-19 18:12:31 +0000
+++ src/session.cpp	2012-01-24 08:23:10 +0000
@@ -26,6 +26,7 @@
 
 #include "core/session.h"
 #include "core/screen.h"
+#include "core/global.h"
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-21 18:31:07 +0000
+++ src/window.cpp	2012-01-24 08:23:10 +0000
@@ -41,10 +41,13 @@
 #include <core/icon.h>
 #include <core/atoms.h>
 #include "core/windowconstrainment.h"
+#include "core/modifierhandler.h"
 #include "privatewindow.h"
 #include "privatescreen.h"
 #include "privatestackdebugger.h"
 
+using namespace compiz::modifiers;
+
 PluginClassStorage::Indices windowPluginClassIndices (0);
 
 unsigned int
@@ -5869,15 +5872,15 @@
 	/* Grab only we have bindings on */
 	foreach (PrivateScreen::ButtonGrab &bind, screen->priv->buttonGrabs)
 	{
-	    unsigned int mods = modHandler->virtualToRealModMask (bind.modifiers);
+	    unsigned int mods = ModifierHandler::Default ()->virtualToRealModMask (bind.modifiers);
 
-	    if (mods & CompNoMask)
+	    if (mods & compiz::modifiers::NoMask)
 		continue;
 
 	    for (unsigned int ignore = 0;
-		     ignore <= modHandler->ignoredModMask (); ignore++)
+		     ignore <= ModifierHandler::Default ()->ignoredModMask (); ignore++)
 	    {
-		if (ignore & ~modHandler->ignoredModMask ())
+		if (ignore & ~ModifierHandler::Default ()->ignoredModMask ())
 		    continue;
 
 		XGrabButton (screen->priv->dpy,