This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch x11-keyboard-repeat
in repository efl.
View the commit online.
commit c145e16117898194a4fab26ee78a2fe96e0ebb63
Author: Swagtoy <m...@ow.swag.toys>
AuthorDate: Fri Jun 27 13:25:43 2025 -0400
Ecore_X: Fix ifdef
---
src/lib/ecore_x/Ecore_X.h | 2 --
src/lib/ecore_x/ecore_x.c | 41 ++++++++++++++++++++++++-----------------
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index ce50500719..e76b283d24 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2066,10 +2066,8 @@ EAPI void ecore_x_window_button_ungrab(Ecore_X_Window win, int butto
EAPI void ecore_x_window_key_grab(Ecore_X_Window win, const char *key, int mod, int any_mod);
EAPI void ecore_x_window_key_ungrab(Ecore_X_Window win, const char *key, int mod, int any_mod);
-#ifdef ECORE_XKB
EAPI Eina_Bool ecore_x_keyboard_repeat_set(Ecore_X_Keyboard_Repeat *repeat);
EAPI Eina_Bool ecore_x_keyboard_repeat_get(Ecore_X_Keyboard_Repeat *repeat);
-#endif /* ECORE_XKB */
EAPI void ecore_x_focus_reset(void);
EAPI void ecore_x_events_allow_all(void);
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index 0d22d92bd7..8bb6ceb042 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -2117,7 +2117,6 @@ _ecore_x_key_grab_resume(void)
}
}
-#ifdef ECORE_XKB
/**
* Sets the keyboard repeat info.
*
@@ -2128,11 +2127,12 @@ _ecore_x_key_grab_resume(void)
EAPI Eina_Bool
ecore_x_keyboard_repeat_set(Ecore_X_Keyboard_Repeat *repeat)
{
+#ifdef ECORE_XKB
XkbDescPtr xkb = XkbAllocKeyboard();
if (!xkb || XkbGetControls(_ecore_x_disp, XkbRepeatKeysMask, xkb) != Success)
{
- if (xkb)
- XkbFreeKeyboard(xkb, 0, True);
+ if (xkb)
+ XkbFreeKeyboard(xkb, 0, True);
return EINA_FALSE;
}
@@ -2141,10 +2141,13 @@ ecore_x_keyboard_repeat_set(Ecore_X_Keyboard_Repeat *repeat)
if (XkbSetControls(_ecore_x_disp, XkbRepeatKeysMask, xkb) == False)
{
XkbFreeKeyboard(xkb, 0, True);
- return EINA_FALSE;
+ return EINA_FALSE;
}
XkbFreeKeyboard(xkb, 0, True);
return EINA_TRUE;
+#else
+ return EINA_FALSE;
+#endif /* ECORE_XKB */
}
/**
@@ -2157,20 +2160,24 @@ ecore_x_keyboard_repeat_set(Ecore_X_Keyboard_Repeat *repeat)
EAPI Eina_Bool
ecore_x_keyboard_repeat_get(Ecore_X_Keyboard_Repeat *repeat)
{
- XkbDescPtr xkb = XkbAllocKeyboard();
- if (!xkb || XkbGetControls(_ecore_x_disp, XkbRepeatKeysMask, xkb) != Success)
- {
- if (xkb)
- XkbFreeKeyboard(xkb, 0, True);
- return EINA_FALSE;
- }
-
- repeat->delay = xkb->ctrls->repeat_delay;
- repeat->rate = xkb->ctrls->repeat_interval;
- XkbFreeKeyboard(xkb, 0, True);
- return EINA_TRUE;
-}
+#ifdef ECORE_XKB
+ XkbDescPtr xkb = XkbAllocKeyboard();
+ if (!xkb || XkbGetControls(_ecore_x_disp, XkbRepeatKeysMask, xkb) != Success)
+ {
+ if (xkb)
+ XkbFreeKeyboard(xkb, 0, True);
+ return EINA_FALSE;
+ }
+
+ repeat->delay = xkb->ctrls->repeat_delay;
+ repeat->rate = xkb->ctrls->repeat_interval;
+ XkbFreeKeyboard(xkb, 0, True);
+ return EINA_TRUE;
+#else
+ return EINA_FALSE;
#endif /* ECORE_XKB */
+}
+
/**
* Send client message with given type and format 32.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.