enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ecore-x - in order to only handle "new kbds" instead of maps add ev info 

als flag in the xkb event to look at in this case. this allows for
fixes in e to not redo kbd layout when xmodmap changes modmap

@feat
This commit is contained in:
Carsten Haitzler 2022-03-24 17:34:58 +00:00
parent 0f6e1c03f0
commit 41dd584789
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/ecore_x/Ecore_X.h
View File

@ -2530,10 +2530,11 @@ struct _Ecore_X_Event_Xkb
int base_group; /** @since 1.21 */
int latched_group; /** @since 1.21 */
int locked_group; /** @since 1.21 */
unsigned int mods; /** @since 1.21 */
unsigned int mods; /** @since 1.21 */
unsigned int base_mods; /** @since 1.21 */
unsigned int latched_mods; /** @since 1.21 */
unsigned int locked_mods; /** @since 1.21 */
unsigned int latched_mods; /** @since 1.21 */
unsigned int locked_mods; /** @since 1.21 */
Eina_Bool map_notify; /** @since 1.27 */
};
typedef struct _Ecore_X_Event_Xkb Ecore_X_Event_Xkb; /** @since 1.7 */
typedef struct _Ecore_X_Event_Xkb Ecore_X_Xkb_State; /** @since 1.21 */

17
src/lib/ecore_x/ecore_x_events.c
View File

@ -2479,20 +2479,15 @@ free_hash(void *data, void *ev)
void
_ecore_x_event_handle_xkb(XEvent *xevent)
{
XkbEvent *xkbev;
xkbev = (XkbEvent *) xevent;
XkbEvent *xkbev = (XkbEvent *)xevent;
Ecore_X_Event_Xkb *e;
if (xkbev->any.xkb_type == XkbStateNotify)
{
Ecore_X_Event_Xkb *e;
if (eina_hash_find(emitted_events, &xkbev->state.serial)) return;
e = calloc(1, sizeof(Ecore_X_Event_Xkb));
if (!e)
return;
if (!e) return;
e->group = xkbev->state.group;
e->base_group = xkbev->state.base_group;
@ -2512,6 +2507,9 @@ _ecore_x_event_handle_xkb(XEvent *xevent)
{
if (eina_hash_find(emitted_events, &xkbev->state.serial)) return;
e = calloc(1, sizeof(Ecore_X_Event_Xkb));
if (!e) return;
if (xkbev->any.xkb_type == XkbMapNotify)
{
XkbMapNotifyEvent *xkbmapping = (XkbMapNotifyEvent *)xkbev;
@ -2524,13 +2522,14 @@ _ecore_x_event_handle_xkb(XEvent *xevent)
_ecore_x_modifiers_get();
_ecore_x_window_grab_resume();
_ecore_x_key_grab_resume();
e->map_notify = EINA_TRUE;
}
else
{
XkbNewKeyboardNotifyEvent *xkbnkn = (void*)xkbev;
if (!(xkbnkn->changed & XkbNKN_KeycodesMask)) return;
}
ecore_event_add(ECORE_X_EVENT_XKB_NEWKBD_NOTIFY, NULL, free_hash,
ecore_event_add(ECORE_X_EVENT_XKB_NEWKBD_NOTIFY, e, free_hash,
(void *)(intptr_t)xkbev->new_kbd.serial);
eina_hash_add(emitted_events, &xkbev->new_kbd.serial, (void *)1);
}