projects
/
m17n
/
m17n-lib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright years
[m17n/m17n-lib.git]
/
src
/
input-gui.c
diff --git
a/src/input-gui.c
b/src/input-gui.c
index
e12d8e9
..
2984381
100644
(file)
--- a/
src/input-gui.c
+++ b/
src/input-gui.c
@@
-1,5
+1,5
@@
/* input-gui.c -- gui-based input method module.
/* input-gui.c -- gui-based input method module.
- Copyright (C) 2003, 2004
+ Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
@@
-684,8
+684,8
@@
MSymbol Mxim;
cleared.
If $EVENT still has modifiers, the name is preceded by "S-"
cleared.
If $EVENT still has modifiers, the name is preceded by "S-"
- (Shift), "C-" (Control), "M-" (Meta), "A-" (Alt), "s-" (Super),
- and/or "H-" (Hyper) in this order.
+ (Shift), "C-" (Control), "M-" (Meta), "A-" (Alt), "G-" (AltGr),
+ "s-" (Super), and "H-" (Hyper) in this order.
For instance, if the keysym name is "a" and the event has Shift,
Meta, and Hyper modifiers, the resulting name is "M-H-A".
For instance, if the keysym name is "a" and the event has Shift,
Meta, and Hyper modifiers, the resulting name is "M-H-A".
@@
-712,8
+712,8
@@
MSymbol Mxim;
0x1F ¤È¤ò¥Ó¥Ã¥Èñ°Ì¤Ç and ±é»»¤·¡¢Control ¥â¥Ç¥£¥Õ¥¡¥¤¥¢¤Ï¼è¤ê½ü¤«¤ì¤ë¡£
¤½¤ì¤Ç¤â $EVENT ¤Ë¤Þ¤À¥â¥Ç¥£¥Õ¥¡¥¤¥¢¤¬¤¢¤ì¤Ð¡¢Ì¾Á°¤ÎÁ°¤Ë¤½¤ì¤¾¤ì
0x1F ¤È¤ò¥Ó¥Ã¥Èñ°Ì¤Ç and ±é»»¤·¡¢Control ¥â¥Ç¥£¥Õ¥¡¥¤¥¢¤Ï¼è¤ê½ü¤«¤ì¤ë¡£
¤½¤ì¤Ç¤â $EVENT ¤Ë¤Þ¤À¥â¥Ç¥£¥Õ¥¡¥¤¥¢¤¬¤¢¤ì¤Ð¡¢Ì¾Á°¤ÎÁ°¤Ë¤½¤ì¤¾¤ì
- "S-" (Shift), "C-" (Control), "M-" (Meta), "A-" (Alt), "s-"
- (Super), "H-" (Hyper)¤¬¤³¤Î½çÈÖ¤ÇÉÕ¤¯¡£
+ "S-" (Shift), "C-" (Control), "M-" (Meta), "A-" (Alt), , "G-" (AltGr),
+ "s-" (Super), "H-" (Hyper)¤¬¤³¤Î½çÈÖ¤ÇÉÕ¤¯¡£
¤¿¤È¤¨¤Ð¡¢keysym ̾¤¬ "a" ¤Ç¥¤¥Ù¥ó¥È¤¬ Shift, Meta, and Hyper
¥â¥Ç¥£¥Õ¥¡¥¤¥¢¤ò»ý¤Æ¤Ð¡¢ÆÀ¤é¤ì¤ë̾Á°¤Ï "M-H-A" ¤Ç¤¢¤ë¡£
¤¿¤È¤¨¤Ð¡¢keysym ̾¤¬ "a" ¤Ç¥¤¥Ù¥ó¥È¤¬ Shift, Meta, and Hyper
¥â¥Ç¥£¥Õ¥¡¥¤¥¢¤ò»ý¤Æ¤Ð¡¢ÆÀ¤é¤ì¤ë̾Á°¤Ï "M-H-A" ¤Ç¤¢¤ë¡£
@@
-734,7
+734,7
@@
minput_event_to_key (MFrame *frame, void *event)
return key;
name = msymbol_name (key);
return key;
name = msymbol_name (key);
- str = alloca (strlen (name) + 2 * 6 + 1);
+ str = alloca (strlen (name) + 2 * 8 + 1);
str[0] = '\0';
if (modifiers & MINPUT_KEY_SHIFT_MODIFIER)
strcat (str, "S-");
str[0] = '\0';
if (modifiers & MINPUT_KEY_SHIFT_MODIFIER)
strcat (str, "S-");
@@
-744,6
+744,8
@@
minput_event_to_key (MFrame *frame, void *event)
strcat (str, "M-");
if (modifiers & MINPUT_KEY_ALT_MODIFIER)
strcat (str, "A-");
strcat (str, "M-");
if (modifiers & MINPUT_KEY_ALT_MODIFIER)
strcat (str, "A-");
+ if (modifiers & MINPUT_KEY_ALTGR_MODIFIER)
+ strcat (str, "G-");
if (modifiers & MINPUT_KEY_SUPER_MODIFIER)
strcat (str, "s-");
if (modifiers & MINPUT_KEY_HYPER_MODIFIER)
if (modifiers & MINPUT_KEY_SUPER_MODIFIER)
strcat (str, "s-");
if (modifiers & MINPUT_KEY_HYPER_MODIFIER)