← Back to branch summary

~noskcaj/ubuntu/trusty/xfwm4/4.11

« back to all changes in this revision

Viewing changes to src/events.c

  • Committer: Jackson Doak
  • Date: 2014-01-19 09:03:46 UTC
  • mfrom: (3.1.12 experimental)
  • Revision ID: noskcaj@ubuntu.com-20140119090346-e7kv45dk1sa3guvq
* Merge from Debian unstable.  Remaining changes:
  - debian/control: demote xfwm4-themes from Recommends to Suggests, per
    the 'other-p-xubuntu-cleanthemes' spec.
  - Add patch from XFCE bugzilla to fix fullscreen behavior with Qt
    based apps 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/events.c
903
903
            part = edgeGetPart (c, ev);
904
904
            edgeButton (c, part, ev);
905
905
        }
906
 
#if 0   /* Binding the alt+scroll wheel to switch app/window is not handy, disabling for now */
907
 
        else if ((ev->button == Button4) && (state) && (state == screen_info->params->easy_click))
908
 
        {
909
 
            clientSwitchWindow ();
910
 
        }
911
 
        else if ((ev->button == Button5) && (state) && (state == screen_info->params->easy_click))
912
 
        {
913
 
            clientSwitchApp ();
914
 
        }
915
 
#endif
 
906
#ifdef HAVE_COMPOSITOR
 
907
        else if ((ev->button == Button4) && (state) && (state == screen_info->params->easy_click)
 
908
                  && (screen_info->compositor_active))
 
909
        {
 
910
            compositorZoomIn(screen_info, ev);
 
911
        }
 
912
        else if ((ev->button == Button5) && (state) && (state == screen_info->params->easy_click)
 
913
                  && (screen_info->compositor_active))
 
914
        {
 
915
            compositorZoomOut(screen_info, ev);
 
916
        }
 
917
#endif /* HAVE_COMPOSITOR */
916
918
        else if (WIN_IS_BUTTON (win))
917
919
        {
918
920
            if (ev->button <= Button3)