mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-10 23:32:09 +00:00
Get the keyboard controls working.
This commit is contained in:
parent
27fdf21120
commit
6be1f516f6
2 changed files with 28 additions and 41 deletions
|
@ -894,19 +894,13 @@ keyDown
|
|||
===============
|
||||
*/
|
||||
|
||||
#define KEY_RIGHTARROW 0xae
|
||||
#define KEY_LEFTARROW 0xac
|
||||
#define KEY_UPARROW 0xad
|
||||
#define KEY_DOWNARROW 0xaf
|
||||
|
||||
|
||||
-_keyDown:(NSEvent *)theEvent
|
||||
{
|
||||
int ch;
|
||||
NSString *chars = [theEvent characters];
|
||||
unichar c = [chars length] == 1 ? [chars characterAtIndex: 0] : '\0';
|
||||
|
||||
ch = tolower ([[theEvent characters] characterAtIndex: 0]);
|
||||
|
||||
switch (ch) {
|
||||
switch (c) {
|
||||
case 13:
|
||||
return self;
|
||||
|
||||
|
@ -924,25 +918,25 @@ keyDown
|
|||
[quakeed_i updateCamera];
|
||||
return self;
|
||||
|
||||
case KEY_RIGHTARROW:
|
||||
case NSRightArrowFunctionKey:
|
||||
ya -= M_PI * move / (64 * 2);
|
||||
[self matrixFromAngles];
|
||||
[quakeed_i updateCamera];
|
||||
break;
|
||||
|
||||
case KEY_LEFTARROW:
|
||||
case NSLeftArrowFunctionKey:
|
||||
ya += M_PI * move / (64 * 2);
|
||||
[self matrixFromAngles];
|
||||
[quakeed_i updateCamera];
|
||||
break;
|
||||
|
||||
case KEY_UPARROW:
|
||||
case NSUpArrowFunctionKey:
|
||||
origin[0] += move * cos (ya);
|
||||
origin[1] += move * sin (ya);
|
||||
[quakeed_i updateCamera];
|
||||
break;
|
||||
|
||||
case KEY_DOWNARROW:
|
||||
case NSDownArrowFunctionKey:
|
||||
origin[0] -= move * cos (ya);
|
||||
origin[1] -= move * sin (ya);
|
||||
[quakeed_i updateCamera];
|
||||
|
|
|
@ -880,73 +880,66 @@ keyDown
|
|||
===============
|
||||
*/
|
||||
|
||||
#define KEY_RIGHTARROW 0xae
|
||||
#define KEY_LEFTARROW 0xac
|
||||
#define KEY_UPARROW 0xad
|
||||
#define KEY_DOWNARROW 0xaf
|
||||
|
||||
-keyDown:(NSEvent *) theEvent
|
||||
{
|
||||
int ch;
|
||||
const char *chars;
|
||||
NSString *chars = [theEvent characters];
|
||||
unichar c = [chars length] == 1 ? [chars characterAtIndex: 0] : '\0';
|
||||
|
||||
// function keys
|
||||
switch ([theEvent keyCode]) {
|
||||
case 60: // F2
|
||||
switch (c) {
|
||||
case NSF2FunctionKey:
|
||||
[cameraview_i setDrawMode:dr_wire];
|
||||
Sys_Printf ("wire draw mode\n");
|
||||
return self;
|
||||
case 61: // F3
|
||||
case NSF3FunctionKey:
|
||||
[cameraview_i setDrawMode:dr_flat];
|
||||
Sys_Printf ("flat draw mode\n");
|
||||
return self;
|
||||
case 62: // F4
|
||||
case NSF4FunctionKey:
|
||||
[cameraview_i setDrawMode:dr_texture];
|
||||
Sys_Printf ("texture draw mode\n");
|
||||
return self;
|
||||
|
||||
case 63: // F5
|
||||
case NSF5FunctionKey:
|
||||
[xyview_i setDrawMode:dr_wire];
|
||||
Sys_Printf ("wire draw mode\n");
|
||||
return self;
|
||||
case 64: // F6
|
||||
case NSF6FunctionKey:
|
||||
Sys_Printf ("texture draw mode\n");
|
||||
return self;
|
||||
|
||||
case 66: // F8
|
||||
case NSF8FunctionKey:
|
||||
[cameraview_i homeView:self];
|
||||
return self;
|
||||
|
||||
case 88: // F12
|
||||
case NSF12FunctionKey:
|
||||
[map_i subtractSelection:self];
|
||||
return self;
|
||||
|
||||
case 106: // page up
|
||||
case NSPageUpFunctionKey:
|
||||
[cameraview_i upFloor:self];
|
||||
return self;
|
||||
|
||||
case 107: // page down
|
||||
case NSPageDownFunctionKey:
|
||||
[cameraview_i downFloor:self];
|
||||
return self;
|
||||
|
||||
case 109: // end
|
||||
case NSEndFunctionKey:
|
||||
[self deselect:self];
|
||||
return self;
|
||||
}
|
||||
|
||||
// portable things
|
||||
chars = [[theEvent characters] cString];
|
||||
ch = chars ? tolower (chars[0]) : 0;
|
||||
|
||||
switch (ch) {
|
||||
case KEY_RIGHTARROW:
|
||||
case KEY_LEFTARROW:
|
||||
case KEY_UPARROW:
|
||||
case KEY_DOWNARROW:
|
||||
case NSRightArrowFunctionKey:
|
||||
case NSLeftArrowFunctionKey:
|
||||
case NSUpArrowFunctionKey:
|
||||
case NSDownArrowFunctionKey:
|
||||
case 'a':
|
||||
case 'A':
|
||||
case 'z':
|
||||
case 'Z':
|
||||
case 'd':
|
||||
case 'D':
|
||||
case 'c':
|
||||
case 'C':
|
||||
case '.':
|
||||
case ',':
|
||||
[cameraview_i _keyDown:theEvent];
|
||||
|
|
Loading…
Reference in a new issue