[Xfce4-commits] <xfwm4:ochosi/tabwin> Merge branch 'master' into ochosi/tabwin

[Simon Steinbeiss]

Updating branch refs/heads/ochosi/tabwin
         to 32337d3fa001f2fdea64c436c78d91d48ccadd38 (commit)
       from 648537cffa9ab60e2e1a8444f2f4da7ac9eca47b (commit)

commit 32337d3fa001f2fdea64c436c78d91d48ccadd38
Merge: 648537c ce5f008
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Dec 12 09:40:14 2013 +0100

    Merge branch 'master' into ochosi/tabwin

commit ce5f008584302362f6374201432f91e3d950715d
Author: Alistair Buxton <a.j.buxton at gmail.com>
Date:   Tue Dec 10 01:32:05 2013 +0000

    Fix crash when compositor is compiled in but disabled.
    
    If user attempts to zoom in when compositor is disabled,
    don't do anything. Also handle possible divide by zero
    if the refresh rate is reported as zero.

 src/compositor.c |    2 ++
 src/events.c     |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 01ff05f..843ce65 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3056,6 +3056,8 @@ compositorZoomIn (ScreenInfo *screen_info, XButtonEvent *ev)
         if (screen_info->display_info->have_xrandr)
         {
             timeout_rate = screen_info->refresh_rate/2;
+            if(timeout_rate < 1)
+                timeout_rate = 30;
         }
 #endif /* HAVE_RANDR */
         screen_info->zoom_timeout_id = g_timeout_add ((1000/timeout_rate), zoom_timeout_cb, screen_info);
diff --git a/src/events.c b/src/events.c
index e70ca16..ccdb2a5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -904,11 +904,13 @@ handleButtonPress (DisplayInfo *display_info, XButtonEvent * ev)
             edgeButton (c, part, ev);
         }
 #ifdef HAVE_COMPOSITOR
-        else if ((ev->button == Button4) && (state) && (state == screen_info->params->easy_click))
+        else if ((ev->button == Button4) && (state) && (state == screen_info->params->easy_click)
+                  && (screen_info->compositor_active))
         {
             compositorZoomIn(screen_info, ev);
         }
-        else if ((ev->button == Button5) && (state) && (state == screen_info->params->easy_click))
+        else if ((ev->button == Button5) && (state) && (state == screen_info->params->easy_click)
+                  && (screen_info->compositor_active))
         {
             compositorZoomOut(screen_info, ev);
         }