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

remove e_comp_wl struct keyboard repeat members 

duplicating these from e_config serves no purpose

ref D3364
This commit is contained in:
Mike Blumenkrantz 2015-11-30 14:12:27 -05:00
parent 6826608961
commit e5e31a2501
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_comp_wl.h
View File

@ -155,8 +155,6 @@ struct _E_Comp_Wl_Data
struct wl_array keys;
struct wl_resource *focus;
int mod_changed;
int repeat_delay;
int repeat_rate;
} kbd;
struct

11
src/bin/e_comp_wl_input.c
View File

@ -183,7 +183,7 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, struct wl_resource *r
/* send current repeat_info */
if (wl_resource_get_version(res) >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION)
wl_keyboard_send_repeat_info(res, e_comp_wl->kbd.repeat_rate, e_comp_wl->kbd.repeat_delay);
wl_keyboard_send_repeat_info(res, e_config->keyboard.repeat_rate, e_config->keyboard.repeat_delay);
/* send current keymap */
wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
@ -419,15 +419,6 @@ e_comp_wl_input_init(void)
e_comp_wl->xkb.fd = -1;
/* get default keyboard repeat rate/delay from configuration */
e_comp_wl->kbd.repeat_delay = e_config->keyboard.repeat_delay;
e_comp_wl->kbd.repeat_rate = e_config->keyboard.repeat_rate;
/* check for valid repeat_delay and repeat_rate value */
/* if invalid, set the default value of repeat delay and rate value */
if (e_comp_wl->kbd.repeat_delay < 0) e_comp_wl->kbd.repeat_delay = 400;
if (e_comp_wl->kbd.repeat_rate < 0) e_comp_wl->kbd.repeat_rate = 25;
/* create the global resource for input seat */
e_comp_wl->seat.global =
wl_global_create(e_comp_wl->wl.disp, &wl_seat_interface, 4,