[Xfce4-commits] [xfce/xfwm4] 05/09: Merge branch 'scale-cursor'

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit bc03559e3e36fc8178f6ef0c0ab36fcd76c46e51
Merge: c5a5ce0 99cfe8d
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Mar 27 21:28:06 2015 +0100

    Merge branch 'scale-cursor'

 src/compositor.c |  183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/screen.h     |    5 ++
 2 files changed, 188 insertions(+)

diff --cc src/compositor.c
index 306a9ef,e27181e..ad7ac55
--- a/src/compositor.c
+++ b/src/compositor.c
@@@ -3188,6 -3386,16 +3327,10 @@@ compositorHandleEvent (DisplayInfo *dis
      {
          compositorHandleShapeNotify (display_info, (XShapeEvent *) ev);
      }
+     else if (ev->type == (display_info->fixes_event_base + XFixesCursorNotify))
+     {
+         compositorHandleCursorNotify (display_info, (XFixesCursorNotifyEvent *) ev);
+     }
 -#ifdef HAVE_RANDR
 -    else if (ev->type == (display_info->xrandr_event_base + RRScreenChangeNotify))
 -    {
 -        compositorHandleRandrNotify (display_info, (XRRScreenChangeNotifyEvent *) ev);
 -    }
 -#endif /* HAVE_RANDR */
  
  #if TIMEOUT_REPAINT == 0
      repair_display (display_info);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.