piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make the Escape key pause the emulator in linux when not in fullscreen.

Browse Source 
I believe this is the same as in windows?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5078 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-02-17 23:44:07 +00:00
parent 2c7b484869
commit 967c5891e9
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -571,7 +571,7 @@ void OpenGL_Update()
switch(event.type) {
case KeyRelease:
key = XLookupKeysym((XKeyEvent*)&event, 0);
if(key >= XK_F1 && key <= XK_F9) {
if((key >= XK_F1 && key <= XK_F9) || key == XK_Escape) {
g_VideoInitialize.pKeyPress(FKeyPressed, ShiftPressed, ControlPressed);
FKeyPressed = -1;
} else {
@ -592,6 +592,11 @@ void OpenGL_Update()
}
else if (key == XK_Return && ((event.xkey.state & Mod1Mask) == Mod1Mask))
ToggleFullscreenMode();
else if (key == XK_Escape)
{
if (!GLWin.fs)
FKeyPressed = 0x1c;
}
else {
if(key == XK_Shift_L || key == XK_Shift_R)
ShiftPressed = true;
@ -632,10 +637,6 @@ void OpenGL_Update()
return;
break;
default:
//TODO: Should we put the event back if we don't handle it?
// I think we handle all the needed ones, the rest shouldn't matter
// But to be safe, let's but them back anyway
//XPutBackEvent(GLWin.dpy, &event);
break;
}
}