mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-15 16:30:50 +00:00
Added support to bind capslock,thanks to Tonik. I think I got all the targets.
This commit is contained in:
parent
41c969c2ac
commit
d5e09cf5ef
10 changed files with 12 additions and 9 deletions
|
@ -866,7 +866,7 @@ byte scantokey[128] =
|
|||
'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',
|
||||
'\'' , '`', K_SHIFT,'\\', 'z', 'x', 'c', 'v', // 2
|
||||
'b', 'n', 'm', ',', '.', '/', K_SHIFT,'*',
|
||||
K_ALT,' ', 0 , K_F1, K_F2, K_F3, K_F4, K_F5, // 3
|
||||
K_ALT,' ', K_CAPSLOCK , K_F1, K_F2, K_F3, K_F4, K_F5, // 3
|
||||
K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE , 0 , K_HOME,
|
||||
K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4
|
||||
K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0, 0, K_F11,
|
||||
|
@ -888,7 +888,7 @@ byte shiftscantokey[128] =
|
|||
'D', 'F', 'G', 'H', 'J', 'K', 'L', ':',
|
||||
'"' , '~', K_SHIFT,'|', 'Z', 'X', 'C', 'V', // 2
|
||||
'B', 'N', 'M', '<', '>', '?', K_SHIFT,'*',
|
||||
K_ALT,' ', 0 , K_F1, K_F2, K_F3, K_F4, K_F5, // 3
|
||||
K_ALT,' ', K_CAPSLOCK , K_F1, K_F2, K_F3, K_F4, K_F5, // 3
|
||||
K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE , 0 , K_HOME,
|
||||
K_UPARROW,K_PGUP,'_',K_LEFTARROW,'%',K_RIGHTARROW,'+',K_END, //4
|
||||
K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0, 0, K_F11,
|
||||
|
|
|
@ -182,7 +182,7 @@ static void IN_init_kb()
|
|||
scantokey[ 55] = KP_MULTIPLY;
|
||||
scantokey[ 56] = K_ALT; /*left */
|
||||
scantokey[ 57] = ' ';
|
||||
/* 58 caps lock */
|
||||
scantokey[ 58] = K_CAPSLOCK;
|
||||
scantokey[ 59] = K_F1;
|
||||
scantokey[ 60] = K_F2;
|
||||
scantokey[ 61] = K_F3;
|
||||
|
|
|
@ -171,6 +171,7 @@ int XLateKey(XKeyEvent *ev)
|
|||
case XK_Alt_R:
|
||||
case XK_Meta_R: key = K_ALT; break;
|
||||
|
||||
case XK_Caps_Lock: key = K_CAPSLOCK; break;
|
||||
case XK_KP_Begin: key = K_AUX30; break;
|
||||
|
||||
case XK_Insert: key = K_INS; break;
|
||||
|
@ -376,12 +377,9 @@ int IN_Init ()
|
|||
XChangeWindowAttributes(x_disp, x_win, attribmask, &attribs_2);
|
||||
}
|
||||
|
||||
// Cvar_RegisterVariable(&_windowed_mouse);
|
||||
_windowed_mouse = Cvar_Get ("_windowed_mouse","0",CVAR_ARCHIVE,"None");
|
||||
// Cvar_RegisterVariable(&m_filter);
|
||||
m_filter = Cvar_Get ("m_filter","0",CVAR_ARCHIVE,"None");
|
||||
#ifdef HAS_DGA
|
||||
// Cvar_RegisterVariable(&vid_dga_mouseaccel);
|
||||
vid_dga_mouseaccel = Cvar_Get ("vid_dga_mouseaccel","1",CVAR_ARCHIVE,
|
||||
"None");
|
||||
XF86DGASetViewPort(x_disp, x_win, 0, 0);
|
||||
|
|
|
@ -170,6 +170,7 @@ keyname_t keynames[] =
|
|||
{"AUX31", K_AUX31},
|
||||
{"AUX32", K_AUX32},
|
||||
|
||||
{"CAPSLOCK",K_CAPSLOCK},
|
||||
{"PRNTSCR", K_PRNTSCR},
|
||||
{"SCRLCK", K_SCRLCK},
|
||||
{"PAUSE", K_PAUSE},
|
||||
|
|
|
@ -150,7 +150,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
#define K_MWHEELUP 239
|
||||
#define K_MWHEELDOWN 240
|
||||
|
||||
#define K_CAPSLOCK 31
|
||||
|
||||
|
||||
typedef enum {key_game, key_console, key_message, key_menu} keydest_t;
|
||||
|
|
|
@ -765,6 +765,7 @@ static int XLateKey(ggi_key_event *ev)
|
|||
case GIIK_AltGr:
|
||||
case GIIK_ModeSwitch: key = K_ALT; break;
|
||||
|
||||
case GIIK_Caps: key = K_CAPSLOCK; break;
|
||||
case GIIK_PrintScreen: key = K_PRNTSCR; break;
|
||||
case GIIK_ScrollLock: key = K_SCRLCK; break;
|
||||
case GIIK_Pause: key = K_PAUSE; break;
|
||||
|
|
|
@ -274,6 +274,7 @@ void Sys_SendKeyEvents(void)
|
|||
case SDLK_LCTRL: sym = K_CTRL; break;
|
||||
case SDLK_RALT:
|
||||
case SDLK_LALT: sym = K_ALT; break;
|
||||
case SDLK_CAPSLOCK: sym = K_CAPSLOCK; break;
|
||||
case SDLK_KP0:
|
||||
if(modstate & KMOD_NUM) sym = K_INS;
|
||||
else sym = SDLK_0;
|
||||
|
|
|
@ -886,6 +886,7 @@ XLateKey(XKeyEvent *ev)
|
|||
case XK_Alt_R:
|
||||
case XK_Meta_R: key = K_ALT; break;
|
||||
|
||||
case XK_Caps_Lock: key = K_CAPSLOCK; break;
|
||||
case XK_KP_Begin: key = K_AUX30; break;
|
||||
|
||||
case XK_Insert: key = K_INS; break;
|
||||
|
|
|
@ -777,6 +777,7 @@ int XLateKey(XKeyEvent *ev)
|
|||
case XK_Meta_L:
|
||||
case XK_Alt_R:
|
||||
case XK_Meta_R: key = K_ALT; break;
|
||||
case XK_Caps_Lock: key = K_CAPSLOCK; break;
|
||||
// various other keys on the keyboard
|
||||
case XK_F27: key = K_HOME; break;
|
||||
case XK_F29: key = K_PGUP; break;
|
||||
|
|
|
@ -2679,7 +2679,7 @@ byte scantokey[128] =
|
|||
'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',
|
||||
'\'' , '`', K_SHIFT,'\\', 'z', 'x', 'c', 'v', // 2
|
||||
'b', 'n', 'm', ',', '.', '/', K_SHIFT,'*',
|
||||
K_ALT,' ', 0 , K_F1, K_F2, K_F3, K_F4, K_F5, // 3
|
||||
K_ALT,' ', K_CAPSLOCK , K_F1, K_F2, K_F3, K_F4, K_F5, // 3
|
||||
K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE, 0 , K_HOME,
|
||||
K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4
|
||||
K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0, 0, K_F11,
|
||||
|
|
Loading…
Reference in a new issue