From 661c19a514b8ccb0c0e31a31b5cf9b945b401cf6 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 7 Feb 2017 11:33:25 -0500 Subject: elput: Set device output name when device is created Small patch to set the output name of an Elput_Device when the device gets created. Note, this was already being done inside elput_input, but this patch moves it to when the device gets created. NB: Really no functional changes here, just moving a function call. Signed-off-by: Chris Michael --- src/lib/elput/elput_evdev.c | 4 ++++ src/lib/elput/elput_input.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/elput') diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c index 9580f49909..b022a6fe0d 100644 --- a/src/lib/elput/elput_evdev.c +++ b/src/lib/elput/elput_evdev.c @@ -1252,6 +1252,7 @@ Elput_Device * _evdev_device_create(Elput_Seat *seat, struct libinput_device *device) { Elput_Device *edev; + const char *oname; edev = calloc(1, sizeof(Elput_Device)); if (!edev) return NULL; @@ -1260,6 +1261,9 @@ _evdev_device_create(Elput_Seat *seat, struct libinput_device *device) edev->device = device; edev->caps = 0; + oname = libinput_device_get_output_name(device); + eina_stringshare_replace(&edev->output_name, oname); + if ((libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) && (libinput_device_keyboard_has_key(device, KEY_ENTER))) { diff --git a/src/lib/elput/elput_input.c b/src/lib/elput/elput_input.c index c854fc9a63..cc29cfc4a6 100644 --- a/src/lib/elput/elput_input.c +++ b/src/lib/elput/elput_input.c @@ -168,7 +168,6 @@ _device_add(Elput_Manager *em, struct libinput_device *dev) { Elput_Seat *eseat; Elput_Device *edev; - const char *oname; eseat = _udev_seat_get(em, dev); if (!eseat) return; @@ -176,9 +175,6 @@ _device_add(Elput_Manager *em, struct libinput_device *dev) edev = _evdev_device_create(eseat, dev); if (!edev) return; - oname = libinput_device_get_output_name(dev); - eina_stringshare_replace(&edev->output_name, oname); - eseat->devices = eina_list_append(eseat->devices, edev); DBG("Input Device Added: %s", libinput_device_get_name(dev)); -- cgit v1.2.1