From 853efefb2894f5a525e6cf924f587c261b911ee6 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Mon, 28 Oct 2002 22:50:00 +0000 Subject: [PATCH] (lispy_accent_codes, lispy_accent_keys): Extend. (lispy_kana_keys): Comment out. (make_lispy_event) [XK_kana_A]: Comment out. --- src/keyboard.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index a578c05e3bc..0c155063a70 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4258,6 +4258,41 @@ static int lispy_accent_codes[] = #else 0, #endif +#ifdef XK_dead_abovering + XK_dead_abovering, +#else + 0, +#endif +#ifdef XK_dead_iota + XK_dead_iota, +#else + 0, +#endif +#ifdef XK_dead_belowdot + XK_dead_belowdot, +#else + 0, +#endif +#ifdef XK_dead_voiced_sound + XK_dead_voiced_sound, +#else + 0, +#endif +#ifdef XK_dead_semivoiced_sound + XK_dead_semivoiced_sound, +#else + 0, +#endif +#ifdef XK_dead_hook + XK_dead_hook, +#else + 0, +#endif +#ifdef XK_dead_horn + XK_dead_horn, +#else + 0, +#endif }; /* This is a list of Lisp names for special "accent" characters. @@ -4278,6 +4313,13 @@ static char *lispy_accent_keys[] = "dead-caron", "dead-doubleacute", "dead-abovedot", + "dead-abovering", + "dead-iota", + "dead-belowdot", + "dead-voiced-sound", + "dead-semivoiced-sound", + "dead-hook", + "dead-horn", }; #ifdef HAVE_NTGUI @@ -4444,6 +4486,10 @@ char *lispy_function_keys[] = #else /* not HAVE_NTGUI */ +/* This should be dealt with in XTread_socket now, and that doesn't + depend on the client system having the Kana syms defined. See also + the XK_kana_A case below. */ +#if 0 #ifdef XK_kana_A static char *lispy_kana_keys[] = { @@ -4478,6 +4524,7 @@ static char *lispy_kana_keys[] = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x4f0 .. 0x4ff */ }; #endif /* XK_kana_A */ +#endif /* 0 */ #define FUNCTION_KEY_OFFSET 0xff00 @@ -4747,6 +4794,7 @@ make_lispy_event (event) (unsigned)-1); } +#if 0 #ifdef XK_kana_A if (event->code >= 0x400 && event->code < 0x500) return modify_event_symbol (event->code - 0x400, @@ -4756,6 +4804,7 @@ make_lispy_event (event) (sizeof (lispy_kana_keys) / sizeof (lispy_kana_keys[0]))); #endif /* XK_kana_A */ +#endif /* 0 */ #ifdef ISO_FUNCTION_KEY_OFFSET if (event->code < FUNCTION_KEY_OFFSET @@ -4774,9 +4823,7 @@ make_lispy_event (event) || (event->code - FUNCTION_KEY_OFFSET >= sizeof lispy_function_keys / sizeof *lispy_function_keys)) { - /* EVENT->code is an unknown keysym, for example someone - assigned `ccaron' to a key in a locale where - XmbLookupString doesn't return a translation for it. */ + /* EVENT->code is an unknown keysym. */ char *name; Lisp_Object symbol; -- 2.39.5