[clutter/clutter-1.18] evdev: Set button modifier state to input devices.

[Emmanuele Bassi <ebassi src gnome org>]

commit 8453ac6b58baf953cb36597a803a7a6f7d441864
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jul 11 15:30:29 2014 +0200

    evdev: Set button modifier state to input devices.
    
    Input devices must get the proper button state, in addition to keyboard
    modifiers.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733062
    (cherry picked from commit f6fd02970c29e58c217ef5563d8d5c53be81acd9)
    Signed-off-by: Emmanuele Bassi <ebassi gnome org>

 clutter/evdev/clutter-device-manager-evdev.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index 7d60d85..25df6ce 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -577,7 +577,8 @@ clutter_event_dispatch (GSource     *g_source,
       _clutter_stage_queue_event (event->any.stage, event, FALSE);
 
       /* update the device states *after* the event */
-      event_state = xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_EFFECTIVE);
+      event_state = seat->button_state |
+        xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_EFFECTIVE);
       _clutter_input_device_set_state (seat->core_pointer, event_state);
       _clutter_input_device_set_state (seat->core_keyboard, event_state);
     }