x input devices - have config apply when you hit apply not just on start

This commit is contained in:
Carsten Haitzler 2021-04-16 15:53:21 +01:00
parent d277df0a51
commit 502a03fd3e
4 changed files with 6 additions and 5 deletions

View File

@ -5495,7 +5495,7 @@ _e_comp_x_devices_change_cb(void *data EINA_UNUSED, int t EINA_UNUSED, void *ev
else else
#endif #endif
{ {
e_comp_x_devices_config_apply(); e_comp_x_devices_config_apply(EINA_FALSE);
} }
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }
@ -6068,7 +6068,7 @@ e_comp_x_init(void)
0, 0,
e_config->screensaver_blanking, e_config->screensaver_blanking,
e_config->screensaver_expose); e_config->screensaver_expose);
e_comp_x_devices_config_apply(); e_comp_x_devices_config_apply(EINA_FALSE);
} }
else else
e_dnd_init(); e_dnd_init();

View File

@ -389,7 +389,7 @@ _handle_dev_prop(int dev_slot, const char *dev, const char *prop, Device_Flags d
} }
E_API void E_API void
e_comp_x_devices_config_apply(void) e_comp_x_devices_config_apply(Eina_Bool force)
{ {
int num_devs, i; int num_devs, i;
Eina_Bool driver_evdev = EINA_FALSE; Eina_Bool driver_evdev = EINA_FALSE;
@ -413,6 +413,7 @@ e_comp_x_devices_config_apply(void)
devstring = eina_strbuf_string_steal(sbuf); devstring = eina_strbuf_string_steal(sbuf);
} }
eina_strbuf_free(sbuf); eina_strbuf_free(sbuf);
changed |= force;
printf("DEV: CHANGES ... have %i devices, changed=%i\n", num_devs, changed); printf("DEV: CHANGES ... have %i devices, changed=%i\n", num_devs, changed);
if (!changed) return; if (!changed) return;
for (i = 0; i < num_devs; i++) for (i = 0; i < num_devs; i++)

View File

@ -6,7 +6,7 @@
# include <Ecore_X.h> # include <Ecore_X.h>
# include "e_atoms.h" # include "e_atoms.h"
E_API void e_comp_x_devices_config_apply(void); E_API void e_comp_x_devices_config_apply(Eina_Bool force);
# endif # endif
#endif #endif

View File

@ -8,7 +8,7 @@ e_mouse_update(void)
{ {
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp->comp_type == E_PIXMAP_TYPE_X) if (e_comp->comp_type == E_PIXMAP_TYPE_X)
e_comp_x_devices_config_apply(); e_comp_x_devices_config_apply(EINA_TRUE);
#endif #endif
#ifdef USE_MODULE_WL_DRM #ifdef USE_MODULE_WL_DRM