#endif
#include <X11/extensions/xf86vmode.h>
+// get the Uchar type
+#include "utf8lib.h"
+
#include "nexuiz.xpm"
#include "darkplaces.xpm"
static Colormap vidx11_colormap;
/*-----------------------------------------------------------------------*/
+//
+
+long keysym2ucs(KeySym keysym);
+void DP_Xutf8LookupString(XKeyEvent * ev,
+ Uchar *uch,
+ KeySym * keysym_return,
+ Status * status_return)
+{
+ int rc;
+ KeySym keysym;
+ int codepoint;
+ char buffer[64];
+ int nbytes = sizeof(buffer);
+
+ rc = XLookupString(ev, buffer, nbytes, &keysym, NULL);
+
+ if (rc > 0) {
+ codepoint = buffer[0] & 0xFF;
+ } else {
+ codepoint = keysym2ucs(keysym);
+ }
-static int XLateKey(XKeyEvent *ev, char *ascii)
+ if (codepoint < 0) {
+ if (keysym == None) {
+ *status_return = XLookupNone;
+ } else {
+ *status_return = XLookupKeySym;
+ *keysym_return = keysym;
+ }
+ *uch = 0;
+ return;
+ }
+
+ *uch = codepoint;
+
+ if (keysym != None) {
+ *keysym_return = keysym;
+ *status_return = XLookupBoth;
+ } else {
+ *status_return = XLookupChars;
+ }
+}
+static int XLateKey(XKeyEvent *ev, Uchar *ascii)
{
int key = 0;
- char buf[64];
+ //char buf[64];
KeySym keysym, shifted;
+ Status status;
keysym = XLookupKeysym (ev, 0);
- XLookupString(ev, buf, sizeof buf, &shifted, 0);
- *ascii = buf[0];
+ DP_Xutf8LookupString(ev, ascii, &shifted, &status);
switch(keysym)
{
{
XEvent event;
int key;
- char ascii;
+ Uchar unicode;
qboolean dowarp = false;
if (!vidx11_display)
{
case KeyPress:
// key pressed
- key = XLateKey (&event.xkey, &ascii);
- Key_Event(key, ascii, true);
+ key = XLateKey (&event.xkey, &unicode);
+ Key_Event(key, unicode, true);
break;
case KeyRelease:
// key released
- key = XLateKey (&event.xkey, &ascii);
- Key_Event(key, ascii, false);
+ key = XLateKey (&event.xkey, &unicode);
+ Key_Event(key, unicode, false);
break;
case MotionNotify:
void VID_Finish (void)
{
- vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
- if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
+ vid_usevsync = vid_vsync.integer && !cls.timedemo && qglXSwapIntervalSGI;
+ if (vid_usingvsync != vid_usevsync)
{
vid_usingvsync = vid_usevsync;
if (qglXSwapIntervalSGI (vid_usevsync))
// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control
// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control
// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control
- gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
+ GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
vid_usingmousegrab = false;
vid_usingmouse = false;