callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Trivial refactor

Browse Source 
Break out a stop_key_repeat function instead of open-coding this
in several places.
This commit is contained in:
Matthias Clasen 2015-08-31 10:54:07 -04:00
parent 04f3b52c38
commit cfeed32c4e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gdk/wayland/gdkdevice-wayland.c
View File

@ -1333,6 +1333,16 @@ get_key_repeat (GdkWaylandDeviceData *device,
return repeat; return repeat;
} }
static void
stop_key_repeat (GdkWaylandDeviceData *device)
{
if (device->repeat_timer)
{
g_source_remove (device->repeat_timer);
device->repeat_timer = 0;
}
}
static gboolean static gboolean
deliver_key_event (GdkWaylandDeviceData *device, deliver_key_event (GdkWaylandDeviceData *device,
uint32_t time_, uint32_t time_,
@ -1387,11 +1397,7 @@ deliver_key_event (GdkWaylandDeviceData *device,
if (state == 0) if (state == 0)
{ {
if (device->repeat_timer) stop_key_repeat (device);
{
g_source_remove (device->repeat_timer);
device->repeat_timer = 0;
}
return FALSE; return FALSE;
} }
else else
@ -1399,11 +1405,7 @@ deliver_key_event (GdkWaylandDeviceData *device,
switch (device->repeat_count) switch (device->repeat_count)
{ {
case 1: case 1:
if (device->repeat_timer) stop_key_repeat (device);
{
g_source_remove (device->repeat_timer);
device->repeat_timer = 0;
}
device->repeat_timer = device->repeat_timer =
gdk_threads_add_timeout (delay, keyboard_repeat, device); gdk_threads_add_timeout (delay, keyboard_repeat, device);
g_source_set_name_by_id (device->repeat_timer, "[gtk+] keyboard_repeat"); g_source_set_name_by_id (device->repeat_timer, "[gtk+] keyboard_repeat");