Commit 1499eedd82998f28b437cf455d84f63f1a108cee
2013-08-13T18:52:46
keysym: add xkb_keysym_to_{lower,upper} These functions are needed later; they are not API functions. The capitalization is not locale sensitive. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
diff --git a/src/keysym.c b/src/keysym.c
index 1e92a4a..33b6491 100644
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -242,6 +242,26 @@ xkb_keysym_is_upper(xkb_keysym_t ks)
return (ks == upper ? true : false);
}
+xkb_keysym_t
+xkb_keysym_to_lower(xkb_keysym_t ks)
+{
+ xkb_keysym_t lower, upper;
+
+ XConvertCase(ks, &lower, &upper);
+
+ return lower;
+}
+
+xkb_keysym_t
+xkb_keysym_to_upper(xkb_keysym_t ks)
+{
+ xkb_keysym_t lower, upper;
+
+ XConvertCase(ks, &lower, &upper);
+
+ return upper;
+}
+
/*
* The following is copied verbatim from libX11:src/KeyBind.c, commit
* d45b3fc19fbe95c41afc4e51d768df6d42332010, with the following changes:
diff --git a/src/keysym.h b/src/keysym.h
index 6f2280b..e9374dc 100644
--- a/src/keysym.h
+++ b/src/keysym.h
@@ -59,4 +59,10 @@ xkb_keysym_is_upper(xkb_keysym_t keysym);
bool
xkb_keysym_is_keypad(xkb_keysym_t keysym);
+xkb_keysym_t
+xkb_keysym_to_upper(xkb_keysym_t ks);
+
+xkb_keysym_t
+xkb_keysym_to_lower(xkb_keysym_t ks);
+
#endif
diff --git a/test/keysym.c b/test/keysym.c
index 46d70ac..439622c 100644
--- a/test/keysym.c
+++ b/test/keysym.c
@@ -183,5 +183,18 @@ main(void)
assert(!xkb_keysym_is_keypad(XKB_KEY_1));
assert(!xkb_keysym_is_keypad(XKB_KEY_Return));
+ assert(xkb_keysym_to_upper(XKB_KEY_a) == XKB_KEY_A);
+ assert(xkb_keysym_to_upper(XKB_KEY_A) == XKB_KEY_A);
+ assert(xkb_keysym_to_lower(XKB_KEY_a) == XKB_KEY_a);
+ assert(xkb_keysym_to_lower(XKB_KEY_A) == XKB_KEY_a);
+ assert(xkb_keysym_to_upper(XKB_KEY_Return) == XKB_KEY_Return);
+ assert(xkb_keysym_to_lower(XKB_KEY_Return) == XKB_KEY_Return);
+ assert(xkb_keysym_to_upper(XKB_KEY_Greek_lambda) == XKB_KEY_Greek_LAMBDA);
+ assert(xkb_keysym_to_upper(XKB_KEY_Greek_LAMBDA) == XKB_KEY_Greek_LAMBDA);
+ assert(xkb_keysym_to_lower(XKB_KEY_Greek_lambda) == XKB_KEY_Greek_lambda);
+ assert(xkb_keysym_to_lower(XKB_KEY_Greek_LAMBDA) == XKB_KEY_Greek_lambda);
+ assert(xkb_keysym_to_upper(XKB_KEY_eacute) == XKB_KEY_Eacute);
+ assert(xkb_keysym_to_lower(XKB_KEY_Eacute) == XKB_KEY_eacute);
+
return 0;
}