diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2022-12-01 19:32:04 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2022-12-01 19:32:04 -0600 |
| commit | f7cf0c13fe927c7e8a4ef972772464bc93751a7a (patch) | |
| tree | 757de779e64751c0e898d8357a5f63adec3c6ee5 /registryd | |
| parent | dc626c9e8966f235e2e0bd6e7c61b31cea6d8f81 (diff) | |
| download | at-spi2-core-f7cf0c13fe927c7e8a4ef972772464bc93751a7a.tar.gz | |
Make mouse_mask_state a field of SpiDEController instead of a global variable
Diffstat (limited to 'registryd')
| -rw-r--r-- | registryd/deviceeventcontroller.c | 9 | ||||
| -rw-r--r-- | registryd/deviceeventcontroller.h | 16 |
2 files changed, 13 insertions, 12 deletions
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 9d05981b..0965c9bf 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -75,7 +75,6 @@ typedef struct { gint y; } SpiPoint; -static unsigned int mouse_mask_state = 0; static unsigned int key_modifier_mask = SPI_KEYMASK_MOD1 | SPI_KEYMASK_MOD2 | SPI_KEYMASK_MOD3 | SPI_KEYMASK_MOD4 | SPI_KEYMASK_MOD5 | SPI_KEYMASK_SHIFT | SPI_KEYMASK_SHIFTLOCK | @@ -384,10 +383,10 @@ spi_dec_poll_mouse_moved (gpointer data) mask_return = spi_dec_plat_mouse_check (controller, &x, &y, &moved); if ((mask_return & key_modifier_mask) != - (mouse_mask_state & key_modifier_mask)) + (controller->mouse_mask_state & key_modifier_mask)) { - spi_dec_plat_emit_modifier_event (controller, mouse_mask_state, mask_return); - mouse_mask_state = mask_return; + spi_dec_plat_emit_modifier_event (controller, controller->mouse_mask_state, mask_return); + controller->mouse_mask_state = mask_return; } return moved; @@ -1691,7 +1690,7 @@ static unsigned get_modifier_state (SpiDEController *controller) { spi_dec_poll_mouse_moved (controller); - return mouse_mask_state; + return controller->mouse_mask_state; } gboolean diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h index bf5f43fe..ec5a13d1 100644 --- a/registryd/deviceeventcontroller.h +++ b/registryd/deviceeventcontroller.h @@ -44,13 +44,15 @@ G_BEGIN_DECLS #define SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEControllerClass)) struct _SpiDEController { - GObject parent; - DBusConnection *bus; - GList *key_listeners; - GList *mouse_listeners; - GList *keygrabs_list; - GQueue *message_queue; - guint message_queue_idle; + GObject parent; + DBusConnection *bus; + GList *key_listeners; + GList *mouse_listeners; + GList *keygrabs_list; + GQueue *message_queue; + guint message_queue_idle; + + guint mouse_mask_state; }; typedef enum { |