zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

SDL2 layer: handle all Ctrl+[A-Z] keys passed to OSD_HandleChar().

Browse source 
See that function for a list of what these do in the OSD.

git-svn-id: https://svn.eduke32.com/eduke32@5324 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-08-09 09:58:45 +00:00
parent c3fa10ab07
commit 607f8e1d1c
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
polymer/eduke32/build/src/sdlayer.c
View file

@ -2029,33 +2029,27 @@ int32_t handleevents_pollsdl(void)
case SDL_KEYDOWN: case SDL_KEYDOWN:
case SDL_KEYUP: case SDL_KEYUP:
code = keytranslation[ev.key.keysym.scancode]; {
const SDL_Scancode sc = ev.key.keysym.scancode;
code = keytranslation[sc];
// XXX: see osd.c, OSD_HandleChar(), there are more... // XXX: see osd.c, OSD_HandleChar(), there are more...
if (ev.key.type == SDL_KEYDOWN && !keyascfifo_isfull() && if (ev.key.type == SDL_KEYDOWN && !keyascfifo_isfull() &&
(ev.key.keysym.scancode == SDL_SCANCODE_RETURN || (sc == SDL_SCANCODE_RETURN || sc == SDL_SCANCODE_KP_ENTER ||
ev.key.keysym.scancode == SDL_SCANCODE_KP_ENTER || sc == SDL_SCANCODE_ESCAPE ||
ev.key.keysym.scancode == SDL_SCANCODE_ESCAPE || sc == SDL_SCANCODE_BACKSPACE ||
ev.key.keysym.scancode == SDL_SCANCODE_BACKSPACE || sc == SDL_SCANCODE_TAB ||
ev.key.keysym.scancode == SDL_SCANCODE_TAB || (ev.key.keysym.mod==KMOD_LCTRL &&
(ev.key.keysym.mod==KMOD_LCTRL && (sc >= SDL_SCANCODE_A && sc <= SDL_SCANCODE_Z))))
(ev.key.keysym.scancode == SDL_SCANCODE_F ||
ev.key.keysym.scancode == SDL_SCANCODE_G ||
ev.key.keysym.scancode == SDL_SCANCODE_K ||
ev.key.keysym.scancode == SDL_SCANCODE_U))))
{ {
char keyvalue; char keyvalue;
switch (ev.key.keysym.scancode) switch (sc)
{ {
case SDL_SCANCODE_RETURN: case SDL_SCANCODE_KP_ENTER: keyvalue = '\r'; break; case SDL_SCANCODE_RETURN: case SDL_SCANCODE_KP_ENTER: keyvalue = '\r'; break;
case SDL_SCANCODE_ESCAPE: keyvalue = 27; break; case SDL_SCANCODE_ESCAPE: keyvalue = 27; break;
case SDL_SCANCODE_BACKSPACE: keyvalue = '\b'; break; case SDL_SCANCODE_BACKSPACE: keyvalue = '\b'; break;
case SDL_SCANCODE_TAB: keyvalue = '\t'; break; case SDL_SCANCODE_TAB: keyvalue = '\t'; break;
case SDL_SCANCODE_F: keyvalue = 6; break; default: keyvalue = sc - SDL_SCANCODE_A + 1; break; // Ctrl+A --> 1, etc.
case SDL_SCANCODE_G: keyvalue = 7; break;
case SDL_SCANCODE_K: keyvalue = 11; break;
case SDL_SCANCODE_U: keyvalue = 21; break;
default: keyvalue = 0; break;
} }
if (OSD_HandleChar(keyvalue)) if (OSD_HandleChar(keyvalue))
keyascfifo_insert(keyvalue); keyascfifo_insert(keyvalue);
@ -2100,6 +2094,7 @@ int32_t handleevents_pollsdl(void)
keypresscallback(code, 0); keypresscallback(code, 0);
} }
break; break;
}
case SDL_MOUSEWHEEL: case SDL_MOUSEWHEEL:
// initprintf("wheel y %d\n",ev.wheel.y); // initprintf("wheel y %d\n",ev.wheel.y);