remove e_comp_wl struct keyboard repeat members

duplicating these from e_config serves no purpose

ref D3364

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index dc268dc..7142f4d 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -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

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index d27d72a..7e8f2e9 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -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,