orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore-wl: Support wl_keyboard_send_repeat_info for adjusting keyboard repeat rate and delay 

Summary: This adds support for allowing a client/compositor to adjust
the keyboard repeat rate and delay via a call to
wl_keyboard_send_repeat_info.

@feature

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-07-15 10:06:20 -04:00
parent 377bf414b1
commit 667d7b15c9
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/ecore_wayland/ecore_wl_input.c
View File

@ -68,6 +68,7 @@ static void _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *ke
static void _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigned int serial, struct wl_surface *surface);
static void _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigned int serial, unsigned int timestamp, unsigned int key, unsigned int state);
static void _ecore_wl_input_cb_keyboard_modifiers(void *data, struct wl_keyboard *keyboard EINA_UNUSED, unsigned int serial EINA_UNUSED, unsigned int depressed, unsigned int latched, unsigned int locked, unsigned int group);
static void _ecore_wl_input_cb_keyboard_repeat_setup(void *data, struct wl_keyboard *keyboard EINA_UNUSED, int32_t rate, int32_t delay);
static Eina_Bool _ecore_wl_input_cb_keyboard_repeat(void *data);
static void _ecore_wl_input_cb_touch_down(void *data, struct wl_touch *touch, unsigned int serial, unsigned int timestamp, struct wl_surface *surface EINA_UNUSED, int id EINA_UNUSED, wl_fixed_t x, wl_fixed_t y);
static void _ecore_wl_input_cb_touch_up(void *data, struct wl_touch *touch, unsigned int serial, unsigned int timestamp, int id EINA_UNUSED);
@ -110,6 +111,7 @@ static const struct wl_keyboard_listener keyboard_listener =
_ecore_wl_input_cb_keyboard_leave,
_ecore_wl_input_cb_keyboard_key,
_ecore_wl_input_cb_keyboard_modifiers,
_ecore_wl_input_cb_keyboard_repeat_setup,
};
static const struct wl_touch_listener touch_listener =
@ -390,6 +392,10 @@ _ecore_wl_input_add(Ecore_Wl_Display *ewd, unsigned int id)
input->keyboard_focus = NULL;
input->touch_focus = NULL;
input->repeat.enabled = EINA_TRUE;
input->repeat.rate = 0.025;
input->repeat.delay = 0.4;
if (ewd->wl.shm)
_ecore_wl_input_setup(input);
input->seat =
@ -846,6 +852,8 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UN
}
else if ((state) && (keycode != input->repeat.key))
{
if (!input->repeat.enabled) return;
input->repeat.sym = sym;
input->repeat.key = keycode;
input->repeat.time = timestamp;
@ -853,9 +861,10 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UN
if (!input->repeat.tmr)
{
input->repeat.tmr =
ecore_timer_add(0.025, _ecore_wl_input_cb_keyboard_repeat, input);
ecore_timer_add(input->repeat.rate,
_ecore_wl_input_cb_keyboard_repeat, input);
}
ecore_timer_delay(input->repeat.tmr, 0.4);
ecore_timer_delay(input->repeat.tmr, input->repeat.delay);
}
}
@ -896,6 +905,27 @@ _ecore_wl_input_cb_keyboard_modifiers(void *data, struct wl_keyboard *keyboard E
input->modifiers |= ECORE_EVENT_MODIFIER_ALTGR;
}
static void
_ecore_wl_input_cb_keyboard_repeat_setup(void *data, struct wl_keyboard *keyboard EINA_UNUSED, int32_t rate, int32_t delay)
{
Ecore_Wl_Input *input;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!(input = data)) return;
if (rate == 0)
{
input->repeat.enabled = EINA_FALSE;
return;
}
else
input->repeat.enabled = EINA_TRUE;
input->repeat.rate = (rate / 1000);
input->repeat.delay = (delay / 100);
}
static Eina_Bool
_ecore_wl_input_cb_keyboard_repeat(void *data)
{

2
src/lib/ecore_wayland/ecore_wl_private.h
View File

@ -237,6 +237,8 @@ struct _Ecore_Wl_Input
{
Ecore_Timer *tmr;
unsigned int sym, key, time;
double rate, delay;
Eina_Bool enabled : 1;
} repeat;
};