Merge lp:~3v1n0/compiz/cursors-update-on-theme+size-changes into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

Screen: monitor root RESOURCE_MANAGER and update cursors when Size or Theme changes

Also add cursorCache and updateCursors notify function

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3952
http://jenkins.qa.ubuntu.com/job/compiz-ci/103/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/48/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/103/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM. Not sure what happend with that diff still around but should not be a problem.

[Andrea Azzarone (azzar1)]

review: Approve

[lp:~3v1n0/compiz/cursors-update-on-theme+size-changes]

3953. By Marco Trevisan (Treviño) on 2015-10-20

Resize: add cursorCache definition to screen-interface

3954. By Marco Trevisan (Treviño) on 2015-10-20

CompScreen: add missing declaration for cursorCache method

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3953
http://jenkins.qa.ubuntu.com/job/compiz-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/49/console
    None: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/49/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/104/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3954
http://jenkins.qa.ubuntu.com/job/compiz-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/50
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/50/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/105/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3954
http://jenkins.qa.ubuntu.com/job/compiz-ci/106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/51/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/51
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/106/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/compiz/cursors-update-on-theme+size-changes]

3955. By Marco Trevisan (Treviño) on 2015-10-22

Screen: no need to update cursors on startup, we have none of them

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-30 20:12:45 +0000
+++ CMakeLists.txt	2015-10-20 22:44:20 +0000
@@ -101,6 +101,7 @@
     xext
     xdamage
     xcomposite
+    xcursor
     x11-xcb
     xrandr
     xinerama
 
=== removed directory 'debian/patches'
=== removed file 'debian/patches/ubuntu_super_p.patch.OTHER'
--- debian/patches/ubuntu_super_p.patch.OTHER	2015-10-20 22:44:20 +0000
+++ debian/patches/ubuntu_super_p.patch.OTHER	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Index: compiz/src/screen.cpp
-===================================================================
---- compiz.orig/src/screen.cpp	2015-09-18 04:41:44.071761222 +0200
-+++ compiz/src/screen.cpp	2015-09-18 04:47:21.284758934 +0200
-@@ -3294,10 +3294,19 @@
- 	     * This is so that we can detect taps on individual modifier
- 	     * keys, and know to cancel the tap if <modifier>+k is pressed.
- 	     */
--	    if (!(currentState & CompAction::StateIgnoreTap))
-+	    int minCode, maxCode;
-+	    XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
-+
-+	    if ((currentState & CompAction::StateIgnoreTap))
-+	    {
-+		KeyCode code_p = XKeysymToKeycode(screen->dpy(), XK_p);
-+
-+		for (k = minCode; k <= maxCode; k++)
-+		    if (k != code_p)
-+			grabUngrabOneKey (modifiers | ignore, k, grab);
-+	    }
-+	    else
- 	    {
--		int minCode, maxCode;
--		XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
- 		for (k = minCode; k <= maxCode; k++)
- 		    grabUngrabOneKey (modifiers | modifierForKeycode | ignore, k, grab);
- 	    }
 
=== modified file 'include/core/abiversion.h'
--- include/core/abiversion.h	2015-10-20 22:44:20 +0000
+++ include/core/abiversion.h	2015-10-20 22:44:20 +0000
@@ -5,6 +5,6 @@
 #  error Conflicting definitions of CORE_ABIVERSION
 #endif
 
-#define CORE_ABIVERSION 20150918
+#define CORE_ABIVERSION 20151010
 
 #endif // COMPIZ_ABIVERSION_H
 
=== modified file 'include/core/screen.h'
--- include/core/screen.h	2015-10-20 22:44:20 +0000
+++ include/core/screen.h	2015-10-20 22:44:20 +0000
@@ -155,6 +155,7 @@
 	virtual void outputChangeNotify ();
 	virtual void addSupportedAtoms (std::vector<Atom>& atoms);
 
+	virtual void cursorChangeNotify (const CompString& theme, int size);
 };
 
 namespace compiz { namespace private_screen {
@@ -217,7 +218,7 @@
 }
 
 class CompScreen :
-    public WrapableHandler<ScreenInterface, 18>,
+    public WrapableHandler<ScreenInterface, 19>,
     public PluginClassStorage, // TODO should be an interface here
     public CompSize,
     public virtual ::compiz::DesktopWindowCount,
@@ -267,6 +268,8 @@
     WRAPABLE_HND (16, ScreenInterface, void, outputChangeNotify);
     WRAPABLE_HND (17, ScreenInterface, void, addSupportedAtoms,
 		  std::vector<Atom>& atoms);
+    WRAPABLE_HND (18, ScreenInterface, void, cursorChangeNotify,
+		  const CompString&, int);
 
     unsigned int allocPluginClassIndex ();
     void freePluginClassIndex (unsigned int index);
@@ -392,6 +395,7 @@
     virtual const char * displayString () = 0;
     virtual CompRect getCurrentOutputExtents () = 0;
     virtual Cursor normalCursor () = 0;
+    virtual Cursor cursorCache (unsigned int cursorName) = 0;
     virtual bool grabbed () = 0;
     virtual SnDisplay * snDisplay () = 0;
 
@@ -445,6 +449,7 @@
     virtual void _matchExpHandlerChanged() = 0;
     virtual void _matchPropertyChanged(CompWindow *) = 0;
     virtual void _outputChangeNotify() = 0;
+    virtual void _cursorChangeNotify(const CompString&, int) = 0;
 };
 
 #endif
 
=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2015-04-10 21:55:21 +0000
+++ plugins/expo/src/expo.cpp	2015-10-20 22:44:20 +0000
@@ -610,7 +610,7 @@
 			       CompWindowGrabMoveMask |
 			       CompWindowGrabButtonMask);
 
-		screen->updateGrab (grabIndex, dragCursor);
+		screen->updateGrab (grabIndex, screen->cursorCache (XC_fleur));
 
 		w->raise ();
 		w->moveInputFocusTo ();
@@ -1578,8 +1578,6 @@
     upKey    = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Up"));
     downKey  = XKeysymToKeycode (s->dpy (), XStringToKeysym ("Down"));
 
-    dragCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
-
     EXPOINITBIND (ExpoKey, doExpo);
     EXPOTERMBIND (ExpoKey, termExpo);
     EXPOINITBIND (ExpoButton, doExpo);
@@ -1603,11 +1601,6 @@
 						     GL_RGBA, GL_UNSIGNED_BYTE);
 }
 
-ExpoScreen::~ExpoScreen ()
-{
-    if (dragCursor != None)
-	XFreeCursor (screen->dpy (), dragCursor);
-}
 
 ExpoWindow::ExpoWindow (CompWindow *w) :
     PluginClassHandler<ExpoWindow, CompWindow> (w),
 
=== modified file 'plugins/expo/src/expo.h'
--- plugins/expo/src/expo.h	2013-07-14 10:38:09 +0000
+++ plugins/expo/src/expo.h	2015-10-20 22:44:20 +0000
@@ -42,7 +42,6 @@
     public:
 
 	ExpoScreen (CompScreen *);
-	~ExpoScreen ();
 
 	void handleEvent (XEvent *);
 
@@ -153,8 +152,6 @@
 	KeyCode rightKey;
 	KeyCode upKey;
 	KeyCode downKey;
-
-	Cursor dragCursor;
 };
 
 class ExpoWindow :
 
=== modified file 'plugins/freewins/src/action.cpp'
--- plugins/freewins/src/action.cpp	2013-03-26 22:02:39 +0000
+++ plugins/freewins/src/action.cpp	2015-10-20 22:44:20 +0000
@@ -82,8 +82,6 @@
 		    useW = getRealWindow (w);
 	}
 
-	mRotateCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
-
 	if (!screen->otherGrabExist ("freewins", 0))
 	    if (!mGrabIndex)
 	    {
@@ -305,11 +303,9 @@
 		    useW = getRealWindow (w);
 	}
 
-	mRotateCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
-
 	if (!screen->otherGrabExist ("freewins", 0))
 	    if (!mGrabIndex)
-		mGrabIndex = screen->pushGrab (mRotateCursor, "freewins");
+		mGrabIndex = screen->pushGrab (screen->cursorCache(XC_fleur), "freewins");
     }
 
     if (useW)
 
=== modified file 'plugins/freewins/src/events.cpp'
--- plugins/freewins/src/events.cpp	2013-03-26 22:02:39 +0000
+++ plugins/freewins/src/events.cpp	2015-10-20 22:44:20 +0000
@@ -60,13 +60,12 @@
 
     window->activate ();
     mGrab = grabResize;
-    fws->mRotateCursor = XCreateFontCursor (screen->dpy (), XC_plus);
     if(!screen->otherGrabExist ("freewins", "resize", 0))
 	if(!fws->mGrabIndex)
 	{
 	    unsigned int mods = 0;
 	    mods &= CompNoMask;
-	    fws->mGrabIndex = screen->pushGrab (fws->mRotateCursor, "resize");
+	    fws->mGrabIndex = screen->pushGrab (screen->cursorCache (XC_plus), "resize");
 	    window->grabNotify (window->x () + (window->width () / 2),
 				window->y () + (window->height () / 2), mods,
 				CompWindowGrabMoveMask | CompWindowGrabButtonMask);
@@ -81,13 +80,12 @@
 
     window->activate ();
     mGrab = grabMove;
-    fws->mRotateCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
     if(!screen->otherGrabExist ("freewins", "resize", 0))
 	if(!fws->mGrabIndex)
 	{
 	    unsigned int mods = 0;
 	    mods &= CompNoMask;
-	    fws->mGrabIndex = screen->pushGrab (fws->mRotateCursor, "resize");
+	    fws->mGrabIndex = screen->pushGrab (screen->cursorCache (XC_fleur), "resize");
 	    window->grabNotify (window->x () + (window->width () / 2),
 				window->y () + (window->height () / 2), mods,
 				CompWindowGrabResizeMask | CompWindowGrabButtonMask);
 
=== modified file 'plugins/freewins/src/freewins.h'
--- plugins/freewins/src/freewins.h	2013-02-20 14:24:30 +0000
+++ plugins/freewins/src/freewins.h	2015-10-20 22:44:20 +0000
@@ -281,8 +281,6 @@
 	int  mSnapMask;
 	int  mInvertMask;
 
-	Cursor mRotateCursor;
-
 	CompScreen::GrabHandle mGrabIndex;
 
 	void preparePaint (int);
 
=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2015-10-20 22:44:20 +0000
+++ plugins/move/src/move.cpp	2015-10-20 22:44:20 +0000
@@ -105,10 +105,12 @@
 
 	if (!ms->grab)
 	{
+	    Cursor moveCursor = screen->cursorCache (XC_fleur);
+
 	    if (state & CompAction::StateInitButton)
-		ms->grab = s->pushPointerGrab (ms->moveCursor, "move");
+		ms->grab = s->pushPointerGrab (moveCursor, "move");
 	    else
-		ms->grab = s->pushGrab (ms->moveCursor, "move");
+		ms->grab = s->pushGrab (moveCursor, "move");
 	}
 
 	if (ms->grab)
@@ -716,7 +718,6 @@
 	key[i] = XKeysymToKeycode (screen->dpy (),
 				   XStringToKeysym (mKeys[i].name));
 
-    moveCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
     if (cScreen)
     {
 	CompositeScreenInterface::setHandler (cScreen);
@@ -739,9 +740,6 @@
 {
     if (region)
 	XDestroyRegion (region);
-
-    if (moveCursor)
-	XFreeCursor (screen->dpy (), moveCursor);
 }
 
 bool
 
=== modified file 'plugins/move/src/move.h'
--- plugins/move/src/move.h	2013-04-13 21:59:11 +0000
+++ plugins/move/src/move.h	2015-10-20 22:44:20 +0000
@@ -82,8 +82,6 @@
 
 	CompScreen::GrabHandle grab;
 
-	Cursor moveCursor;
-
 	unsigned int origState;
 
 	int	snapOffX;
 
=== modified file 'plugins/resize/src/logic/include/resize-logic.h'
--- plugins/resize/src/logic/include/resize-logic.h	2014-05-28 07:08:10 +0000
+++ plugins/resize/src/logic/include/resize-logic.h	2015-10-20 22:44:20 +0000
@@ -113,20 +113,10 @@
 	int          pointerDx;
 	int          pointerDy;
 	KeyCode      key[NUM_KEYS];
+	unsigned int keyCursorNames[NUM_KEYS];
 
 	CompScreen::GrabHandle grabIndex;
 
-	Cursor leftCursor;
-	Cursor rightCursor;
-	Cursor upCursor;
-	Cursor upLeftCursor;
-	Cursor upRightCursor;
-	Cursor downCursor;
-	Cursor downLeftCursor;
-	Cursor downRightCursor;
-	Cursor middleCursor;
-	Cursor cursor[NUM_KEYS];
-
 	bool       isConstrained;
 	CompRegion constraintRegion;
 	bool       inRegionStatus;
 
=== modified file 'plugins/resize/src/logic/include/screen-interface.h'
--- plugins/resize/src/logic/include/screen-interface.h	2015-10-20 22:44:20 +0000
+++ plugins/resize/src/logic/include/screen-interface.h	2015-10-20 22:44:20 +0000
@@ -59,6 +59,7 @@
 	virtual CompScreen::GrabHandle pushPointerGrab (Cursor cursor, const char *name) = 0;
 	virtual CompScreen::GrabHandle pushKeyboardGrab (const char *name) = 0;
 	virtual void removeGrab (CompScreen::GrabHandle handle, CompPoint *restorePointer) = 0;
+	virtual Cursor cursorCache (unsigned int cursorName) = 0;
 
 	/* CompOption::Class */
 	virtual CompOption * getOption (const CompString &name) = 0;
 
=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2015-10-20 22:44:20 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2015-10-20 22:44:20 +0000
@@ -27,6 +27,7 @@
 
 #include <core/core.h>
 #include <core/atoms.h>
+#include <X11/cursorfont.h>
 
 #include "resize-logic.h"
 
@@ -48,6 +49,16 @@
 static const unsigned short TOUCH_TOP = 3;
 static const unsigned short TOUCH_BOTTOM = 4;
 
+#define LEFT_CURSOR XC_left_side
+#define RIGHT_CURSOR XC_right_side
+#define UP_CURSOR XC_top_side
+#define UP_LEFT_CURSOR XC_top_left_corner
+#define UP_RIGHT_CURSOR XC_top_right_corner
+#define DOWN_CURSOR XC_bottom_side
+#define DOWN_LEFT_CURSOR XC_bottom_left_corner
+#define DOWN_RIGHT_CURSOR XC_bottom_right_corner
+#define MIDDLE_CURSOR XC_fleur
+
 using namespace resize;
 
 ResizeLogic::ResizeLogic() :
@@ -428,7 +439,7 @@
 		    lastMaskY = mask;
 		}
 
-		mScreen->updateGrab (grabIndex, cursor[i]);
+		mScreen->updateGrab (grabIndex, screen->cursorCache (keyCursorNames[i]));
 	    }
 	    break;
 	}
@@ -652,36 +663,36 @@
 Cursor
 ResizeLogic::cursorFromResizeMask (unsigned int mask)
 {
-    Cursor cursor;
+    unsigned int cursor_name;
 
     if (mask & ResizeLeftMask)
     {
 	if (mask & ResizeDownMask)
-	    cursor = downLeftCursor;
+	    cursor_name = DOWN_LEFT_CURSOR;
 	else if (mask & ResizeUpMask)
-	    cursor = upLeftCursor;
+	    cursor_name = UP_LEFT_CURSOR;
 	else
-	    cursor = leftCursor;
+	    cursor_name = LEFT_CURSOR;
     }
     else if (mask & ResizeRightMask)
     {
 	if (mask & ResizeDownMask)
-	    cursor = downRightCursor;
+	    cursor_name = DOWN_RIGHT_CURSOR;
 	else if (mask & ResizeUpMask)
-	    cursor = upRightCursor;
+	    cursor_name = UP_RIGHT_CURSOR;
 	else
-	    cursor = rightCursor;
+	    cursor_name = RIGHT_CURSOR;
     }
     else if (mask & ResizeUpMask)
     {
-	cursor = upCursor;
+	cursor_name = UP_CURSOR;
     }
     else
     {
-	cursor = downCursor;
+	cursor_name = DOWN_CURSOR;
     }
 
-    return cursor;
+    return screen->cursorCache (cursor_name);
 }
 
 void
@@ -1327,7 +1338,7 @@
 	    Cursor cursor;
 
 	    if (state & CompAction::StateInitKey)
-		cursor = middleCursor;
+		cursor = screen->cursorCache (MIDDLE_CURSOR);
 	    else
 		cursor = cursorFromResizeMask (mask);
 
 
=== modified file 'plugins/resize/src/logic/tests/mock-screen.h'
--- plugins/resize/src/logic/tests/mock-screen.h	2015-10-20 22:44:20 +0000
+++ plugins/resize/src/logic/tests/mock-screen.h	2015-10-20 22:44:20 +0000
@@ -54,6 +54,7 @@
 	MOCK_METHOD2(pushPointerGrab, CompScreen::GrabHandle(Cursor cursor, const char *name));
 	MOCK_METHOD1(pushKeyboardGrab, CompScreen::GrabHandle(const char *name));
 	MOCK_METHOD2(removeGrab, void(CompScreen::GrabHandle handle, CompPoint *restorePointer));
+	MOCK_METHOD1(cursorCache, Cursor (unsigned int));
 
 	MOCK_METHOD1(getOption, CompOption*(const CompString &name));
 
 
=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2013-05-15 10:23:30 +0000
+++ plugins/resize/src/resize.cpp	2015-10-20 22:44:20 +0000
@@ -380,7 +380,6 @@
     logic.options = this;
 
     CompOption::Vector atomTemplate;
-    Display *dpy = s->dpy ();
     ResizeOptions::ChangeNotify notify =
 	       boost::bind (&ResizeScreen::optionChanged, this, _1, _2);
 
@@ -404,21 +403,6 @@
     for (unsigned int i = 0; i < NUM_KEYS; i++)
 	logic.key[i] = XKeysymToKeycode (s->dpy (), XStringToKeysym (logic.rKeys[i].name));
 
-    logic.leftCursor      = XCreateFontCursor (dpy, XC_left_side);
-    logic.rightCursor     = XCreateFontCursor (dpy, XC_right_side);
-    logic.upCursor        = XCreateFontCursor (dpy, XC_top_side);
-    logic.upLeftCursor    = XCreateFontCursor (dpy, XC_top_left_corner);
-    logic.upRightCursor   = XCreateFontCursor (dpy, XC_top_right_corner);
-    logic.downCursor      = XCreateFontCursor (dpy, XC_bottom_side);
-    logic.downLeftCursor  = XCreateFontCursor (dpy, XC_bottom_left_corner);
-    logic.downRightCursor = XCreateFontCursor (dpy, XC_bottom_right_corner);
-    logic.middleCursor    = XCreateFontCursor (dpy, XC_fleur);
-
-    logic.cursor[0] = logic.leftCursor;
-    logic.cursor[1] = logic.rightCursor;
-    logic.cursor[2] = logic.upCursor;
-    logic.cursor[3] = logic.downCursor;
-
     optionSetInitiateKeyInitiate (resizeInitiateDefaultMode);
     optionSetInitiateKeyTerminate (resizeTerminate);
     optionSetInitiateButtonInitiate (resizeInitiateDefaultMode);
@@ -442,27 +426,6 @@
 
 ResizeScreen::~ResizeScreen ()
 {
-    Display *dpy = screen->dpy ();
-
-    if (logic.leftCursor)
-	XFreeCursor (dpy, logic.leftCursor);
-    if (logic.rightCursor)
-	XFreeCursor (dpy, logic.rightCursor);
-    if (logic.upCursor)
-	XFreeCursor (dpy, logic.upCursor);
-    if (logic.downCursor)
-	XFreeCursor (dpy, logic.downCursor);
-    if (logic.middleCursor)
-	XFreeCursor (dpy, logic.middleCursor);
-    if (logic.upLeftCursor)
-	XFreeCursor (dpy, logic.upLeftCursor);
-    if (logic.upRightCursor)
-	XFreeCursor (dpy, logic.upRightCursor);
-    if (logic.downLeftCursor)
-	XFreeCursor (dpy, logic.downLeftCursor);
-    if (logic.downRightCursor)
-	XFreeCursor (dpy, logic.downRightCursor);
-
     delete logic.mScreen;
     delete logic.cScreen;
     delete logic.gScreen;
 
=== modified file 'plugins/resize/src/screen-impl.h'
--- plugins/resize/src/screen-impl.h	2015-10-20 22:44:20 +0000
+++ plugins/resize/src/screen-impl.h	2015-10-20 22:44:20 +0000
@@ -134,6 +134,11 @@
 	    return mImpl->height ();
 	}
 
+	virtual Cursor cursorCache (unsigned int cursorName)
+	{
+	    return mImpl->cursorCache (cursorName);
+	}
+
     private:
 	CompScreen *mImpl;
 };
 
=== modified file 'plugins/shelf/src/shelf.cpp'
--- plugins/shelf/src/shelf.cpp	2013-05-09 13:43:07 +0000
+++ plugins/shelf/src/shelf.cpp	2015-10-20 22:44:20 +0000
@@ -509,7 +509,7 @@
     {
 	window->activate ();
 	ss->grabbedWindow = window->id ();
-	ss->grabIndex = screen->pushGrab (ss->moveCursor, "shelf");
+	ss->grabIndex = screen->pushGrab (screen->cursorCache (XC_fleur), "shelf");
 
 	ss->lastPointerX = x;
 	ss->lastPointerY = y;
@@ -760,7 +760,6 @@
     gScreen (GLScreen::get (screen)),
     grabIndex (0),
     grabbedWindow (None),
-    moveCursor (XCreateFontCursor (screen->dpy (), XC_fleur)),
     lastPointerX (0),
     lastPointerY (0)
 {
@@ -780,11 +779,6 @@
 								_3));
 }
 
-ShelfScreen::~ShelfScreen ()
-{
-    if (moveCursor)
-	XFreeCursor (screen->dpy (), moveCursor);
-}
 
 ShelfWindow::ShelfWindow (CompWindow *window) :
     PluginClassHandler <ShelfWindow, CompWindow> (window),
 
=== modified file 'plugins/shelf/src/shelf.h'
--- plugins/shelf/src/shelf.h	2012-09-07 23:29:42 +0000
+++ plugins/shelf/src/shelf.h	2015-10-20 22:44:20 +0000
@@ -145,7 +145,6 @@
     public:
 
 	ShelfScreen (CompScreen *);
-	~ShelfScreen ();
 
 	CompositeScreen *cScreen;
 	GLScreen	*gScreen;
 
=== modified file 'plugins/shift/src/shift.cpp'
--- plugins/shift/src/shift.cpp	2013-05-11 09:30:49 +0000
+++ plugins/shift/src/shift.cpp	2015-10-20 22:44:20 +0000
@@ -1968,7 +1968,6 @@
     mMvTarget (0),
     mMvVelocity (0),
     mInvert (false),
-    mCursor (XCreateFontCursor (screen->dpy (), XC_left_ptr)),
     mWindows (NULL),
     mNWindows (0),
     mWindowsSize (0),
@@ -2059,8 +2058,6 @@
 {
     freeWindowTitle ();
 
-    XFreeCursor (screen->dpy (), mCursor);
-
     if (mWindows)
         free (mWindows);
 
 
=== modified file 'plugins/shift/src/shift.h'
--- plugins/shift/src/shift.h	2013-04-27 16:51:53 +0000
+++ plugins/shift/src/shift.h	2015-10-20 22:44:20 +0000
@@ -143,8 +143,6 @@
 	float           mMvVelocity;
 	bool            mInvert;
 	
-	Cursor          mCursor;
-	
 	/* only used for sorting */
 	CompWindow      **mWindows;
 	int             mNWindows;
 
=== modified file 'plugins/widget/src/widget.cpp'
--- plugins/widget/src/widget.cpp	2013-05-28 21:31:18 +0000
+++ plugins/widget/src/widget.cpp	2015-10-20 22:44:20 +0000
@@ -312,7 +312,7 @@
     }
 
     if (!mGrabIndex)
-	mGrabIndex = screen->pushGrab (mCursor, "widget");
+	mGrabIndex = screen->pushGrab (screen->cursorCache (XC_watch), "widget");
 
     enableFunctions (this, true);
 
@@ -672,8 +672,7 @@
     mLastActiveWindow (None),
     mCompizWidgetAtom (XInternAtom (screen->dpy (), "_COMPIZ_WIDGET", false)),
     mFadeTime         (0),
-    mGrabIndex        (0),
-    mCursor           (XCreateFontCursor (screen->dpy (), XC_watch))
+    mGrabIndex        (0)
 {
     CompAction::CallBack cb;
     ChangeNotify         notify;
@@ -706,9 +705,6 @@
 {
     screen->matchExpHandlerChangedSetEnabled (this, false);
     screen->matchExpHandlerChanged ();
-
-    if (mCursor)
-	XFreeCursor (screen->dpy (), mCursor);
 }
 
 WidgetWindow::WidgetWindow (CompWindow *window) :
 
=== modified file 'plugins/widget/src/widget.h'
--- plugins/widget/src/widget.h	2013-05-28 21:31:18 +0000
+++ plugins/widget/src/widget.h	2015-10-20 22:44:20 +0000
@@ -107,7 +107,6 @@
 	WidgetState            mState;
 	int                    mFadeTime;
 	CompScreen::GrabHandle mGrabIndex;
-	Cursor                 mCursor;
 };
 
 #define WIDGET_SCREEN(screen)						       \
 
=== modified file 'src/event.cpp'
--- src/event.cpp	2015-08-05 11:26:30 +0000
+++ src/event.cpp	2015-10-20 22:44:20 +0000
@@ -1801,6 +1801,11 @@
 	    if (w)
 		w->priv->updateClassHints ();
 	}
+	else if (event->xproperty.atom == XA_RESOURCE_MANAGER)
+	{
+	    if (event->xproperty.window == privateScreen.rootWindow())
+		privateScreen.updateResources();
+	}
 	break;
     case MotionNotify:
 	break;
 
=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2015-10-20 22:44:20 +0000
+++ src/privatescreen.h	2015-10-20 22:44:20 +0000
@@ -688,6 +688,8 @@
 
 	void updateScreenInfo ();
 
+	void updateResources ();
+
 	Window getActiveWindow (Window root);
 
 	void setWindowState (unsigned int state, Window id);
@@ -708,6 +710,10 @@
 
 	void setDefaultWindowAttributes (XWindowAttributes *);
 
+	void updateCursors (const CompString& theme, int size);
+
+	Cursor cursorCache (unsigned int cursorName);
+
 	static void compScreenSnEvent (SnMonitorEvent *event,
 			   void           *userData);
 
@@ -775,9 +781,8 @@
     Window wmSnSelectionWindow;
 
     int    clientPointerDeviceId;
-    Cursor normalCursor;
-    Cursor busyCursor;
     Cursor invisibleCursor;
+    std::vector<Cursor> cursors;
     CompRect workArea;
 
     bool initialized;
@@ -814,6 +819,7 @@
     Window xdndWindow;
     compiz::private_screen::PluginManager pluginManager;
     compiz::private_screen::WindowManager& windowManager;
+    CompOption::Vector resourceManager;
 };
 
 class CompManager
@@ -966,8 +972,8 @@
 	void unhookServerWindow (CompWindow *w);
 
 	Cursor normalCursor ();
-
 	Cursor invisibleCursor ();
+	Cursor cursorCache (unsigned int cursorName);
 
 	/* Adds an X Pointer and Keyboard grab to the stack. Since
 	 * compiz as a client only need to grab once, multiple clients
@@ -1176,6 +1182,7 @@
         virtual void _matchExpHandlerChanged();
         virtual void _matchPropertyChanged(CompWindow *);
         virtual void _outputChangeNotify();
+        virtual void _cursorChangeNotify(const CompString&, int);
 
 	void grabServer ();
 	void ungrabServer ();
 
=== modified file 'src/privatescreen/tests/test-privatescreen.cpp'
--- src/privatescreen/tests/test-privatescreen.cpp	2015-10-20 22:44:20 +0000
+++ src/privatescreen/tests/test-privatescreen.cpp	2015-10-20 22:44:20 +0000
@@ -81,6 +81,7 @@
     MOCK_METHOD0(_matchExpHandlerChanged, void ());
     MOCK_METHOD1(_matchPropertyChanged, void (CompWindow *));
     MOCK_METHOD0(_outputChangeNotify, void ());
+    MOCK_METHOD2(_cursorChangeNotify, void (const CompString&, int));
 
     MOCK_METHOD0(outputDevs, CompOutput::vector & ());
     MOCK_METHOD2(setWindowState, void (unsigned int state, Window id));
@@ -177,6 +178,7 @@
     MOCK_METHOD0(displayString, const char * ());
     MOCK_METHOD0(getCurrentOutputExtents, CompRect ());
     MOCK_METHOD0(normalCursor, Cursor ());
+    MOCK_METHOD1(cursorCache, Cursor (unsigned int));
     MOCK_METHOD0(grabbed, bool ());
     MOCK_METHOD0(snDisplay, SnDisplay * ());
     MOCK_CONST_METHOD0(createFailed, bool ());
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2015-10-20 22:44:20 +0000
+++ src/screen.cpp	2015-10-20 22:44:20 +0000
@@ -44,6 +44,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
 #define foreach BOOST_FOREACH
 
 #include <X11/Xlib.h>
@@ -53,6 +54,7 @@
 #include <X11/extensions/shape.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput2.h>
+#include <X11/Xcursor/Xcursor.h>
 
 #include <core/global.h>
 #include <core/screen.h>
@@ -77,10 +79,12 @@
 namespace
 {
 bool inHandleEvent = false;
-
 bool screenInitalized = false;
 }
 
+#define normalCursorName    XC_left_ptr
+#define busyCursorName      XC_watch
+
 #define MwmHintsFunctions   (1L << 0)
 #define MwmHintsDecorations (1L << 1)
 static const unsigned short PropMotifWmHintElements = 3;
@@ -101,6 +105,14 @@
 
 PluginClassStorage::Indices screenPluginClassIndices (0);
 
+namespace utils
+{
+bool is_number (CompString const& s)
+{
+    return std::find_if (s.begin (), s.end (), [](char c) { return !std::isdigit (c); }) == s.end ();
+}
+}
+
 void CompScreenImpl::sizePluginClasses(unsigned int size)
 {
     if(size != pluginClasses.size ())
@@ -1271,8 +1283,8 @@
     eventManager.quit ();
 }
 
-static const std::string IMAGEDIR("images");
-static const std::string HOMECOMPIZDIR(".compiz-1");
+static const CompString IMAGEDIR("images");
+static const CompString HOMECOMPIZDIR(".compiz-1");
 
 bool
 CompScreenImpl::readImageFromFile (CompString &name,
@@ -1353,6 +1365,68 @@
     return w;
 }
 
+void
+PrivateScreen::updateResources ()
+{
+    Atom	  actual;
+    int		  result, format;
+    unsigned long n, left;
+    unsigned char *data;
+
+    result = XGetWindowProperty (dpy, root,
+				 XA_RESOURCE_MANAGER, 0L, 65536, False,
+				 XA_STRING, &actual, &format,
+				 &n, &left, &data);
+
+    int oldCursorSize = CompOption::getIntOptionNamed (resourceManager, "Xcursor.size", -1);
+    CompString oldCursorTheme = CompOption::getStringOptionNamed (resourceManager, "Xcursor.theme");
+    resourceManager.clear ();
+
+    if (result == Success && data)
+    {
+	if (actual == XA_STRING)
+	{
+	    std::vector<CompString> lines;
+	    CompString resources (reinterpret_cast<char *> (data));
+	    boost::split (lines, resources, boost::is_any_of ("\n"));
+
+	    for (auto const& line : lines)
+	    {
+		std::vector<CompString> pair;
+		boost::split (pair, line, boost::is_any_of ("\t"));
+
+		if (pair.size () == 2 && pair[0].back () == ':')
+		{
+		    CompOption option;
+		    auto key = pair[0].substr (0, pair[0].size () - 1);
+		    auto const& value = pair[1];
+
+		    if (utils::is_number (value))
+		    {
+			option.setName (key, CompOption::TypeInt);
+			option.value ().set (std::atoi (value.c_str ()));
+		    }
+		    else
+		    {
+			option.setName (key, CompOption::TypeString);
+			option.value ().set (value);
+		    }
+
+		    resourceManager.push_back (option);
+		}
+	    }
+	}
+
+	XFree (data);
+    }
+
+    int cursorSize = CompOption::getIntOptionNamed (resourceManager, "Xcursor.size", -1);
+    CompString const& cursorTheme = CompOption::getStringOptionNamed (resourceManager, "Xcursor.theme");
+
+    if (cursorSize != oldCursorSize || cursorTheme != oldCursorTheme)
+	screen->cursorChangeNotify (cursorTheme, cursorSize);
+}
+
 bool
 CompScreen::fileToImage (CompString &name,
 			 CompSize   &size,
@@ -2078,9 +2152,9 @@
     if (priv->initialized)
     {
 	if (!emptySequence())
-	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->busyCursor);
+	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->cursorCache (busyCursorName));
 	else
-	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->normalCursor);
+	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->cursorCache (normalCursorName));
     }
 }
 
@@ -3012,7 +3086,7 @@
 Cursor
 CompScreenImpl::normalCursor ()
 {
-    return privateScreen.normalCursor;
+    return privateScreen.cursorCache (normalCursorName);
 }
 
 Cursor
@@ -3021,6 +3095,12 @@
     return privateScreen.invisibleCursor;
 }
 
+Cursor
+CompScreenImpl::cursorCache (unsigned int cursorName)
+{
+    return privateScreen.cursorCache (cursorName);
+}
+
 #define POINTER_GRAB_MASK (ButtonReleaseMask | \
 			   ButtonPressMask   | \
 			   PointerMotionMask)
@@ -3302,10 +3382,19 @@
 	     * This is so that we can detect taps on individual modifier
 	     * keys, and know to cancel the tap if <modifier>+k is pressed.
 	     */
-	    if (!(currentState & CompAction::StateIgnoreTap))
-	    {
-		int minCode, maxCode;
-		XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
+	    int minCode, maxCode;
+	    XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
+
+	    if ((currentState & CompAction::StateIgnoreTap))
+	    {
+		KeyCode code_p = XKeysymToKeycode(screen->dpy(), XK_p);
+
+		for (k = minCode; k <= maxCode; k++)
+		    if (k != code_p)
+			grabUngrabOneKey (modifiers | ignore, k, grab);
+	    }
+	    else
+	    {
 		for (k = minCode; k <= maxCode; k++)
 		    grabUngrabOneKey (modifiers | modifierForKeycode | ignore, k, grab);
 	    }
@@ -3782,11 +3871,11 @@
 	setsid ();
 
 	pos = env.find (':');
-	if (pos != std::string::npos)
+	if (pos != CompString::npos)
 	{
 	    size_t pointPos = env.find ('.', pos);
 
-	    if (pointPos != std::string::npos)
+	    if (pointPos != CompString::npos)
 	    {
 		env.erase (pointPos);
 	    }
@@ -4066,6 +4155,53 @@
 {
 }
 
+void
+CompScreen::cursorChangeNotify (const CompString& theme, int size)
+{
+    WRAPABLE_HND_FUNCTN (cursorChangeNotify, theme, size);
+    _cursorChangeNotify (theme, size);
+}
+
+Cursor
+PrivateScreen::cursorCache (unsigned int cursorName)
+{
+    if (cursorName >= XC_num_glyphs)
+	return 0;
+
+    if (cursors.size() > cursorName && cursors[cursorName])
+	return cursors[cursorName];
+
+    cursors.resize(std::max<size_t>(cursorName + 1, cursors.size()), 0);
+    cursors[cursorName] = XCreateFontCursor (dpy, cursorName);
+
+    return cursors[cursorName];
+}
+
+void
+PrivateScreen::updateCursors (const CompString& theme, int size)
+{
+    XcursorSetDefaultSize (dpy, size);
+    XcursorSetTheme (dpy, theme.c_str());
+
+    for (auto it = begin (cursors); it != end (cursors); ++it)
+    {
+	if (*it)
+	{
+	   XFreeCursor (dpy, *it);
+	   *it = XCreateFontCursor (dpy, it - begin (cursors));
+	}
+    }
+
+    XIDefineCursor (dpy, clientPointerDeviceId, root, cursorCache (normalCursorName));
+    startupSequence.updateStartupFeedback ();
+}
+
+void
+CompScreenImpl::_cursorChangeNotify (const CompString& theme, int size)
+{
+    privateScreen.updateCursors (theme, size);
+}
+
 /* Returns default viewport for some window geometry. If the window spans
  * more than one viewport the most appropriate viewport is returned. How the
  * most appropriate viewport is computed can be made optional if necessary. It
@@ -4208,6 +4344,9 @@
 ScreenInterface::addSupportedAtoms (std::vector<Atom>& atoms)
     WRAPABLE_DEF (addSupportedAtoms, atoms)
 
+void
+ScreenInterface::cursorChangeNotify (const CompString& theme, int size)
+    WRAPABLE_DEF (cursorChangeNotify, theme, size)
 
 Window
 CompScreenImpl::root ()
@@ -5060,12 +5199,10 @@
     eventManager.setSupportingWmCheck (dpy, rootWindow());
     screen->updateSupportedWmHints ();
 
+
     XIGetClientPointer (dpy, None, &clientPointerDeviceId);
-
-    normalCursor = XCreateFontCursor (dpy, XC_left_ptr);
-    busyCursor   = XCreateFontCursor (dpy, XC_watch);
-
-    XIDefineCursor (dpy, clientPointerDeviceId, rootWindow(), normalCursor);
+    updateCursors (XcursorGetTheme (dpy), XcursorGetDefaultSize (dpy));
+    updateResources ();
 
     /* Attempt to gain SubstructureRedirectMask */
     CompScreenImpl::checkForError (dpy);
@@ -5241,8 +5378,6 @@
     currentDesktop (0),
     wmSnSelectionWindow (None),
     clientPointerDeviceId (None),
-    normalCursor (None),
-    busyCursor (None),
     invisibleCursor (None),
     initialized (false),
     screen(screen),
@@ -5363,11 +5498,8 @@
 
 	eventManager.destroyGrabWindow (dpy);
 
-	if (normalCursor != None)
-	    XFreeCursor (dpy, normalCursor);
-
-	if (busyCursor != None)
-	    XFreeCursor (dpy, busyCursor);
+	for (auto cursor : cursors)
+	    XFreeCursor (dpy, cursor);
 
 	if (invisibleCursor != None)
 	    XFreeCursor (dpy, invisibleCursor);