Mercurial > hg > xemacs-beta

comparison src/event-Xt.c @ 5558:10455659ab64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 53c066311921, I have a better approach.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 28 Aug 2011 10:22:24 +0100
parents 53c066311921
children f3ab0c29c246
comparison
equal deleted inserted replaced
5557:53c066311921 5558:10455659ab64
62 use XtGetValues(), but ... */ 62 use XtGetValues(), but ... */
63 #include <X11/ShellP.h> 63 #include <X11/ShellP.h>
64 64
65 #if defined (HAVE_XIM) && defined (XIM_MOTIF) 65 #if defined (HAVE_XIM) && defined (XIM_MOTIF)
66 #include "xmotif.h" 66 #include "xmotif.h"
67 #endif
68
69 #ifdef HAVE_X11_XF86KEYSYM_H
70 #include <X11/XF86keysym.h>
71 #endif 67 #endif
72 68
73 #ifdef HAVE_DRAGNDROP 69 #ifdef HAVE_DRAGNDROP
74 #include "dragdrop.h" 70 #include "dragdrop.h"
75 #endif 71 #endif
1232 if (modifiers & XEMACS_MOD_SHIFT) 1228 if (modifiers & XEMACS_MOD_SHIFT)
1233 { 1229 {
1234 int Mode_switch_p = *state & xd->ModeMask; 1230 int Mode_switch_p = *state & xd->ModeMask;
1235 KeySym bot = XLookupKeysym (ev, Mode_switch_p ? 2 : 0); 1231 KeySym bot = XLookupKeysym (ev, Mode_switch_p ? 2 : 0);
1236 KeySym top = XLookupKeysym (ev, Mode_switch_p ? 3 : 1); 1232 KeySym top = XLookupKeysym (ev, Mode_switch_p ? 3 : 1);
1237
1238 #ifdef HAVE_X11_XF86KEYSYM_H
1239 /* XLookupKeysm() and XLookupString() differ for these
1240 keysyms under X.org. The latter treats them as not
1241 visible to X11 apps (so if the event has the shift
1242 modifer, the keysym of the unshifted key will be
1243 returned) while the former treats them as visible. We
1244 chose to follow XLookupString in x_to_emacs_keysym(), so
1245 we need to do that here, too. */
1246
1247 if (XF86XK_Switch_VT_1 <= top && top <= XF86XK_Prev_VMode)
1248 {
1249 top = NoSymbol;
1250 }
1251 #endif
1252 if (top && bot && top != bot) 1233 if (top && bot && top != bot)
1253 modifiers &= ~XEMACS_MOD_SHIFT; 1234 modifiers &= ~XEMACS_MOD_SHIFT;
1254 } 1235 }
1255 set_event_type (emacs_event, key_press_event); 1236 set_event_type (emacs_event, key_press_event);
1256 SET_EVENT_TIMESTAMP (emacs_event, ev->time); 1237 SET_EVENT_TIMESTAMP (emacs_event, ev->time);