X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=fc4cdcb735793508f5631d2c5bb43fcfecd254c6;hb=b89606df66f908e527f94a14efaa6499d423083b;hp=22075cb485455d05e6afecb8828fa19554b0e033;hpb=fabdca42b48cc4acf214c06adda9814e5cce8577;p=xonotic%2Fdarkplaces.git

diff --git a/vid_glx.c b/vid_glx.c
index 22075cb4..fc4cdcb7 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -53,7 +53,7 @@ const char *(GLAPIENTRY *qglXQueryExtensionsString)(Display *dpy, int screen);
 //GLX_ARB_get_proc_address
 void *(GLAPIENTRY *qglXGetProcAddressARB)(const GLubyte *procName);
 
-static gl_extensionfunctionlist_t getprocaddressfuncs[] =
+static dllfunction_t getprocaddressfuncs[] =
 {
 	{"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB},
 	{NULL, NULL}
@@ -63,7 +63,7 @@ static gl_extensionfunctionlist_t getprocaddressfuncs[] =
 GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count);
 GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count);
 
-static gl_extensionfunctionlist_t videosyncfuncs[] =
+static dllfunction_t videosyncfuncs[] =
 {
 	{"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI},
 	{"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI},
@@ -106,105 +106,127 @@ static Colormap vidx11_colormap;
 
 /*-----------------------------------------------------------------------*/
 
-static int
-XLateKey(XKeyEvent *ev)
+static int XLateKey(XKeyEvent *ev)
 {
 	int key = 0;
+	char buf[64];
 	KeySym keysym;
 
-	keysym = XLookupKeysym(ev, 0);
+	XLookupString(ev, buf, sizeof buf, &keysym, 0);
 
 	switch(keysym)
 	{
-		case XK_KP_Page_Up:	key = KP_PGUP; break;
-		case XK_Page_Up:	key = K_PGUP; break;
+		case XK_KP_Page_Up:	 key = K_KP_PGUP; break;
+		case XK_Page_Up:	 key = K_PGUP; break;
 
-		case XK_KP_Page_Down:	key = KP_PGDN; break;
-		case XK_Page_Down:	key = K_PGDN; break;
+		case XK_KP_Page_Down: key = K_KP_PGDN; break;
+		case XK_Page_Down:	 key = K_PGDN; break;
 
-		case XK_KP_Home:	key = KP_HOME; break;
-		case XK_Home:		key = K_HOME; break;
+		case XK_KP_Home: key = K_KP_HOME; break;
+		case XK_Home:	 key = K_HOME; break;
 
-		case XK_KP_End:		key = KP_END; break;
-		case XK_End:		key = K_END; break;
+		case XK_KP_End:  key = K_KP_END; break;
+		case XK_End:	 key = K_END; break;
 
-		case XK_KP_Left:	key = KP_LEFTARROW; break;
-		case XK_Left:		key = K_LEFTARROW; break;
+		case XK_KP_Left: key = K_KP_LEFTARROW; break;
+		case XK_Left:	 key = K_LEFTARROW; break;
 
-		case XK_KP_Right:	key = KP_RIGHTARROW; break;
-		case XK_Right:		key = K_RIGHTARROW; break;
+		case XK_KP_Right: key = K_KP_RIGHTARROW; break;
+		case XK_Right:	key = K_RIGHTARROW;		break;
 
-		case XK_KP_Down:	key = KP_DOWNARROW; break;
-		case XK_Down:		key = K_DOWNARROW; break;
+		case XK_KP_Down: key = K_KP_DOWNARROW; break;
+		case XK_Down:	 key = K_DOWNARROW; break;
 
-		case XK_KP_Up:		key = KP_UPARROW; break;
-		case XK_Up:			key = K_UPARROW; break;
+		case XK_KP_Up:   key = K_KP_UPARROW; break;
+		case XK_Up:		 key = K_UPARROW;	 break;
 
-		case XK_Escape:		key = K_ESCAPE; break;
+		case XK_Escape: key = K_ESCAPE;		break;
 
-		case XK_KP_Enter:	key = KP_ENTER; break;
-		case XK_Return:		key = K_ENTER; break;
+		case XK_KP_Enter: key = K_KP_ENTER;	break;
+		case XK_Return: key = K_ENTER;		 break;
 
-		case XK_Tab:		key = K_TAB; break;
+		case XK_Tab:		key = K_TAB;			 break;
 
-		case XK_F1:			key = K_F1; break;
-		case XK_F2:			key = K_F2; break;
-		case XK_F3:			key = K_F3; break;
-		case XK_F4:			key = K_F4; break;
-		case XK_F5:			key = K_F5; break;
-		case XK_F6:			key = K_F6; break;
-		case XK_F7:			key = K_F7; break;
-		case XK_F8:			key = K_F8; break;
-		case XK_F9:			key = K_F9; break;
-		case XK_F10:		key = K_F10; break;
-		case XK_F11:		key = K_F11; break;
-		case XK_F12:		key = K_F12; break;
+		case XK_F1:		 key = K_F1;				break;
 
-		case XK_BackSpace:	key = K_BACKSPACE; break;
+		case XK_F2:		 key = K_F2;				break;
 
-		case XK_KP_Delete:	key = KP_DEL; break;
-		case XK_Delete:		key = K_DEL; break;
+		case XK_F3:		 key = K_F3;				break;
 
-		case XK_Pause:		key = K_PAUSE; break;
+		case XK_F4:		 key = K_F4;				break;
+
+		case XK_F5:		 key = K_F5;				break;
+
+		case XK_F6:		 key = K_F6;				break;
+
+		case XK_F7:		 key = K_F7;				break;
+
+		case XK_F8:		 key = K_F8;				break;
+
+		case XK_F9:		 key = K_F9;				break;
+
+		case XK_F10:		key = K_F10;			 break;
+
+		case XK_F11:		key = K_F11;			 break;
+
+		case XK_F12:		key = K_F12;			 break;
+
+		case XK_BackSpace: key = K_BACKSPACE; break;
+
+		case XK_KP_Delete: key = K_KP_DEL; break;
+		case XK_Delete: key = K_DEL; break;
+
+		case XK_Pause:	key = K_PAUSE;		 break;
 
 		case XK_Shift_L:
-		case XK_Shift_R:	key = K_SHIFT; break;
+		case XK_Shift_R:	key = K_SHIFT;		break;
 
 		case XK_Execute:
 		case XK_Control_L:
-		case XK_Control_R:	key = K_CTRL; break;
+		case XK_Control_R:	key = K_CTRL;		 break;
 
-		case XK_Mode_switch:
 		case XK_Alt_L:
 		case XK_Meta_L:
 		case XK_Alt_R:
-		case XK_Meta_R:		key = K_ALT; break;
+		case XK_Meta_R: key = K_ALT;			break;
 
-		case XK_Caps_Lock:	key = K_CAPSLOCK; break;
-		case XK_KP_Begin:	key = KP_5; break;
+		case XK_KP_Begin: key = K_KP_5;	break;
 
-		case XK_Insert:		key = K_INS; break;
-		case XK_KP_Insert:	key = KP_INS; break;
+		case XK_Insert:key = K_INS; break;
+		case XK_KP_Insert: key = K_KP_INS; break;
 
-		case XK_KP_Multiply:	key = KP_MULTIPLY; break;
-		case XK_KP_Add:		key = KP_PLUS; break;
-		case XK_KP_Subtract:	key = KP_MINUS; break;
-		case XK_KP_Divide:	key = KP_DIVIDE; break;
+		case XK_KP_Multiply: key = '*'; break;
+		case XK_KP_Add:  key = K_KP_PLUS; break;
+		case XK_KP_Subtract: key = K_KP_MINUS; break;
+		case XK_KP_Divide: key = K_KP_SLASH; break;
 
-		/* For Sun keyboards */
-		case XK_F27:		key = K_HOME; break;
-		case XK_F29:		key = K_PGUP; break;
-		case XK_F33:		key = K_END; break;
-		case XK_F35:		key = K_PGDN; break;
+#if 0
+		case 0x021: key = '1';break;/* [!] */
+		case 0x040: key = '2';break;/* [@] */
+		case 0x023: key = '3';break;/* [#] */
+		case 0x024: key = '4';break;/* [$] */
+		case 0x025: key = '5';break;/* [%] */
+		case 0x05e: key = '6';break;/* [^] */
+		case 0x026: key = '7';break;/* [&] */
+		case 0x02a: key = '8';break;/* [*] */
+		case 0x028: key = '9';;break;/* [(] */
+		case 0x029: key = '0';break;/* [)] */
+		case 0x05f: key = '-';break;/* [_] */
+		case 0x02b: key = '=';break;/* [+] */
+		case 0x07c: key = '\'';break;/* [|] */
+		case 0x07d: key = '[';break;/* [}] */
+		case 0x07b: key = ']';break;/* [{] */
+		case 0x022: key = '\'';break;/* ["] */
+		case 0x03a: key = ';';break;/* [:] */
+		case 0x03f: key = '/';break;/* [?] */
+		case 0x03e: key = '.';break;/* [>] */
+		case 0x03c: key = ',';break;/* [<] */
+#endif
 
 		default:
-			if (keysym < 128)
-			{
-				/* ASCII keys */
-				key = keysym;
-				if ((key >= 'A') && (key <= 'Z'))
-					key = key + ('a' - 'A');
-			}
+			key = *(unsigned char*)buf;
+			if (key >= 'A' && key <= 'Z')
+				key = key - 'A' + 'a';
 			break;
 	}