ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert a number of spaces to tabs.

This commit is contained in:
greg-kennedy 2015-12-19 21:08:46 -06:00
parent afb1619815
commit 250947af95
1 changed files with 199 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

398
unix/x11.cpp
View File

@ -2,7 +2,7 @@
Snes9x - Portable Super Nintendo Entertainment System (TM) emulator. Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
(c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com), (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com),
Jerremy Koot (jkoot@snes9x.com) Jerremy Koot (jkoot@snes9x.com)
(c) Copyright 2002 - 2004 Matthew Kendora (c) Copyright 2002 - 2004 Matthew Kendora
@ -13,103 +13,103 @@
(c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net) (c) Copyright 2001 - 2006 John Weidman (jweidman@slip.net)
(c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca), (c) Copyright 2002 - 2006 funkyass (funkyass@spam.shaw.ca),
Kris Bleakley (codeviolation@hotmail.com) Kris Bleakley (codeviolation@hotmail.com)
(c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net), (c) Copyright 2002 - 2010 Brad Jorsch (anomie@users.sourceforge.net),
Nach (n-a-c-h@users.sourceforge.net), Nach (n-a-c-h@users.sourceforge.net),
(c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com) (c) Copyright 2002 - 2011 zones (kasumitokoduck@yahoo.com)
(c) Copyright 2006 - 2007 nitsuja (c) Copyright 2006 - 2007 nitsuja
(c) Copyright 2009 - 2011 BearOso, (c) Copyright 2009 - 2011 BearOso,
OV2 OV2
BS-X C emulator code BS-X C emulator code
(c) Copyright 2005 - 2006 Dreamer Nom, (c) Copyright 2005 - 2006 Dreamer Nom,
zones zones
C4 x86 assembler and some C emulation code C4 x86 assembler and some C emulation code
(c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com), (c) Copyright 2000 - 2003 _Demo_ (_demo_@zsnes.com),
Nach, Nach,
zsKnight (zsknight@zsnes.com) zsKnight (zsknight@zsnes.com)
C4 C++ code C4 C++ code
(c) Copyright 2003 - 2006 Brad Jorsch, (c) Copyright 2003 - 2006 Brad Jorsch,
Nach Nach
DSP-1 emulator code DSP-1 emulator code
(c) Copyright 1998 - 2006 _Demo_, (c) Copyright 1998 - 2006 _Demo_,
Andreas Naive (andreasnaive@gmail.com), Andreas Naive (andreasnaive@gmail.com),
Gary Henderson, Gary Henderson,
Ivar (ivar@snes9x.com), Ivar (ivar@snes9x.com),
John Weidman, John Weidman,
Kris Bleakley, Kris Bleakley,
Matthew Kendora, Matthew Kendora,
Nach, Nach,
neviksti (neviksti@hotmail.com) neviksti (neviksti@hotmail.com)
DSP-2 emulator code DSP-2 emulator code
(c) Copyright 2003 John Weidman, (c) Copyright 2003 John Weidman,
Kris Bleakley, Kris Bleakley,
Lord Nightmare (lord_nightmare@users.sourceforge.net), Lord Nightmare (lord_nightmare@users.sourceforge.net),
Matthew Kendora, Matthew Kendora,
neviksti neviksti
DSP-3 emulator code DSP-3 emulator code
(c) Copyright 2003 - 2006 John Weidman, (c) Copyright 2003 - 2006 John Weidman,
Kris Bleakley, Kris Bleakley,
Lancer, Lancer,
z80 gaiden z80 gaiden
DSP-4 emulator code DSP-4 emulator code
(c) Copyright 2004 - 2006 Dreamer Nom, (c) Copyright 2004 - 2006 Dreamer Nom,
John Weidman, John Weidman,
Kris Bleakley, Kris Bleakley,
Nach, Nach,
z80 gaiden z80 gaiden
OBC1 emulator code OBC1 emulator code
(c) Copyright 2001 - 2004 zsKnight, (c) Copyright 2001 - 2004 zsKnight,
pagefault (pagefault@zsnes.com), pagefault (pagefault@zsnes.com),
Kris Bleakley Kris Bleakley
Ported from x86 assembler to C by sanmaiwashi Ported from x86 assembler to C by sanmaiwashi
SPC7110 and RTC C++ emulator code used in 1.39-1.51 SPC7110 and RTC C++ emulator code used in 1.39-1.51
(c) Copyright 2002 Matthew Kendora with research by (c) Copyright 2002 Matthew Kendora with research by
zsKnight, zsKnight,
John Weidman, John Weidman,
Dark Force Dark Force
SPC7110 and RTC C++ emulator code used in 1.52+ SPC7110 and RTC C++ emulator code used in 1.52+
(c) Copyright 2009 byuu, (c) Copyright 2009 byuu,
neviksti neviksti
S-DD1 C emulator code S-DD1 C emulator code
(c) Copyright 2003 Brad Jorsch with research by (c) Copyright 2003 Brad Jorsch with research by
Andreas Naive, Andreas Naive,
John Weidman John Weidman
S-RTC C emulator code S-RTC C emulator code
(c) Copyright 2001 - 2006 byuu, (c) Copyright 2001 - 2006 byuu,
John Weidman John Weidman
ST010 C++ emulator code ST010 C++ emulator code
(c) Copyright 2003 Feather, (c) Copyright 2003 Feather,
John Weidman, John Weidman,
Kris Bleakley, Kris Bleakley,
Matthew Kendora Matthew Kendora
Super FX x86 assembler emulator code Super FX x86 assembler emulator code
(c) Copyright 1998 - 2003 _Demo_, (c) Copyright 1998 - 2003 _Demo_,
pagefault, pagefault,
zsKnight zsKnight
Super FX C emulator code Super FX C emulator code
(c) Copyright 1997 - 1999 Ivar, (c) Copyright 1997 - 1999 Ivar,
Gary Henderson, Gary Henderson,
John Weidman John Weidman
Sound emulator code used in 1.5-1.51 Sound emulator code used in 1.5-1.51
(c) Copyright 1998 - 2003 Brad Martin (c) Copyright 1998 - 2003 Brad Martin
@ -125,7 +125,7 @@
(c) Copyright 1999 - 2001 Derek Liauw Kie Fa (c) Copyright 1999 - 2001 Derek Liauw Kie Fa
HQ2x, HQ3x, HQ4x filters HQ2x, HQ3x, HQ4x filters
(c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com) (c) Copyright 2003 Maxim Stepin (maxim@hiend3d.com)
NTSC filter NTSC filter
(c) Copyright 2006 - 2007 Shay Green (c) Copyright 2006 - 2007 Shay Green
@ -135,10 +135,10 @@
Win32 GUI code Win32 GUI code
(c) Copyright 2003 - 2006 blip, (c) Copyright 2003 - 2006 blip,
funkyass, funkyass,
Matthew Kendora, Matthew Kendora,
Nach, Nach,
nitsuja nitsuja
(c) Copyright 2009 - 2011 OV2 (c) Copyright 2009 - 2011 OV2
Mac OS GUI code Mac OS GUI code
@ -343,136 +343,136 @@ const char * S9xParseDisplayConfig (ConfigFile &conf, int pass)
if (!conf.GetBool("Unix::ClearAllControls", false)) if (!conf.GetBool("Unix::ClearAllControls", false))
{ {
keymaps.push_back(strpair_t("K00:k", "Joypad1 Right")); keymaps.push_back(strpair_t("K00:k", "Joypad1 Right"));
keymaps.push_back(strpair_t("K00:Right", "Joypad1 Right")); keymaps.push_back(strpair_t("K00:Right", "Joypad1 Right"));
keymaps.push_back(strpair_t("K00:h", "Joypad1 Left")); keymaps.push_back(strpair_t("K00:h", "Joypad1 Left"));
keymaps.push_back(strpair_t("K00:Left", "Joypad1 Left")); keymaps.push_back(strpair_t("K00:Left", "Joypad1 Left"));
keymaps.push_back(strpair_t("K00:j", "Joypad1 Down")); keymaps.push_back(strpair_t("K00:j", "Joypad1 Down"));
keymaps.push_back(strpair_t("K00:n", "Joypad1 Down")); keymaps.push_back(strpair_t("K00:n", "Joypad1 Down"));
keymaps.push_back(strpair_t("K00:Down", "Joypad1 Down")); keymaps.push_back(strpair_t("K00:Down", "Joypad1 Down"));
keymaps.push_back(strpair_t("K00:u", "Joypad1 Up")); keymaps.push_back(strpair_t("K00:u", "Joypad1 Up"));
keymaps.push_back(strpair_t("K00:Up", "Joypad1 Up")); keymaps.push_back(strpair_t("K00:Up", "Joypad1 Up"));
keymaps.push_back(strpair_t("K00:Return", "Joypad1 Start")); keymaps.push_back(strpair_t("K00:Return", "Joypad1 Start"));
keymaps.push_back(strpair_t("K00:space", "Joypad1 Select")); keymaps.push_back(strpair_t("K00:space", "Joypad1 Select"));
keymaps.push_back(strpair_t("K00:S+d", "Joypad1 ToggleTurbo A")); keymaps.push_back(strpair_t("K00:S+d", "Joypad1 ToggleTurbo A"));
keymaps.push_back(strpair_t("K00:C+d", "Joypad1 ToggleSticky A")); keymaps.push_back(strpair_t("K00:C+d", "Joypad1 ToggleSticky A"));
keymaps.push_back(strpair_t("K00:d", "Joypad1 A")); keymaps.push_back(strpair_t("K00:d", "Joypad1 A"));
keymaps.push_back(strpair_t("K00:S+c", "Joypad1 ToggleTurbo B")); keymaps.push_back(strpair_t("K00:S+c", "Joypad1 ToggleTurbo B"));
keymaps.push_back(strpair_t("K00:C+c", "Joypad1 ToggleSticky B")); keymaps.push_back(strpair_t("K00:C+c", "Joypad1 ToggleSticky B"));
keymaps.push_back(strpair_t("K00:c", "Joypad1 B")); keymaps.push_back(strpair_t("K00:c", "Joypad1 B"));
keymaps.push_back(strpair_t("K00:S+s", "Joypad1 ToggleTurbo X")); keymaps.push_back(strpair_t("K00:S+s", "Joypad1 ToggleTurbo X"));
keymaps.push_back(strpair_t("K00:C+s", "Joypad1 ToggleSticky X")); keymaps.push_back(strpair_t("K00:C+s", "Joypad1 ToggleSticky X"));
keymaps.push_back(strpair_t("K00:s", "Joypad1 X")); keymaps.push_back(strpair_t("K00:s", "Joypad1 X"));
keymaps.push_back(strpair_t("K00:S+x", "Joypad1 ToggleTurbo Y")); keymaps.push_back(strpair_t("K00:S+x", "Joypad1 ToggleTurbo Y"));
keymaps.push_back(strpair_t("K00:C+x", "Joypad1 ToggleSticky Y")); keymaps.push_back(strpair_t("K00:C+x", "Joypad1 ToggleSticky Y"));
keymaps.push_back(strpair_t("K00:x", "Joypad1 Y")); keymaps.push_back(strpair_t("K00:x", "Joypad1 Y"));
keymaps.push_back(strpair_t("K00:S+a", "Joypad1 ToggleTurbo L")); keymaps.push_back(strpair_t("K00:S+a", "Joypad1 ToggleTurbo L"));
keymaps.push_back(strpair_t("K00:S+v", "Joypad1 ToggleTurbo L")); keymaps.push_back(strpair_t("K00:S+v", "Joypad1 ToggleTurbo L"));
keymaps.push_back(strpair_t("K00:C+a", "Joypad1 ToggleSticky L")); keymaps.push_back(strpair_t("K00:C+a", "Joypad1 ToggleSticky L"));
keymaps.push_back(strpair_t("K00:C+v", "Joypad1 ToggleSticky L")); keymaps.push_back(strpair_t("K00:C+v", "Joypad1 ToggleSticky L"));
keymaps.push_back(strpair_t("K00:a", "Joypad1 L")); keymaps.push_back(strpair_t("K00:a", "Joypad1 L"));
keymaps.push_back(strpair_t("K00:v", "Joypad1 L")); keymaps.push_back(strpair_t("K00:v", "Joypad1 L"));
keymaps.push_back(strpair_t("K00:S+z", "Joypad1 ToggleTurbo R")); keymaps.push_back(strpair_t("K00:S+z", "Joypad1 ToggleTurbo R"));
keymaps.push_back(strpair_t("K00:C+z", "Joypad1 ToggleSticky R")); keymaps.push_back(strpair_t("K00:C+z", "Joypad1 ToggleSticky R"));
keymaps.push_back(strpair_t("K00:z", "Joypad1 R")); keymaps.push_back(strpair_t("K00:z", "Joypad1 R"));
keymaps.push_back(strpair_t("K00:KP_Left", "Joypad2 Left")); keymaps.push_back(strpair_t("K00:KP_Left", "Joypad2 Left"));
keymaps.push_back(strpair_t("K00:KP_Right", "Joypad2 Right")); keymaps.push_back(strpair_t("K00:KP_Right", "Joypad2 Right"));
keymaps.push_back(strpair_t("K00:KP_Up", "Joypad2 Up")); keymaps.push_back(strpair_t("K00:KP_Up", "Joypad2 Up"));
keymaps.push_back(strpair_t("K00:KP_Down", "Joypad2 Down")); keymaps.push_back(strpair_t("K00:KP_Down", "Joypad2 Down"));
keymaps.push_back(strpair_t("K00:KP_Enter", "Joypad2 Start")); keymaps.push_back(strpair_t("K00:KP_Enter", "Joypad2 Start"));
keymaps.push_back(strpair_t("K00:KP_Add", "Joypad2 Select")); keymaps.push_back(strpair_t("K00:KP_Add", "Joypad2 Select"));
keymaps.push_back(strpair_t("K00:Prior", "Joypad2 A")); keymaps.push_back(strpair_t("K00:Prior", "Joypad2 A"));
keymaps.push_back(strpair_t("K00:Next", "Joypad2 B")); keymaps.push_back(strpair_t("K00:Next", "Joypad2 B"));
keymaps.push_back(strpair_t("K00:Home", "Joypad2 X")); keymaps.push_back(strpair_t("K00:Home", "Joypad2 X"));
keymaps.push_back(strpair_t("K00:End", "Joypad2 Y")); keymaps.push_back(strpair_t("K00:End", "Joypad2 Y"));
keymaps.push_back(strpair_t("K00:Insert", "Joypad2 L")); keymaps.push_back(strpair_t("K00:Insert", "Joypad2 L"));
keymaps.push_back(strpair_t("K00:Delete", "Joypad2 R")); keymaps.push_back(strpair_t("K00:Delete", "Joypad2 R"));
keymaps.push_back(strpair_t("K00:A+F4", "SoundChannel0")); keymaps.push_back(strpair_t("K00:A+F4", "SoundChannel0"));
keymaps.push_back(strpair_t("K00:C+F4", "SoundChannel0")); keymaps.push_back(strpair_t("K00:C+F4", "SoundChannel0"));
keymaps.push_back(strpair_t("K00:A+F5", "SoundChannel1")); keymaps.push_back(strpair_t("K00:A+F5", "SoundChannel1"));
keymaps.push_back(strpair_t("K00:C+F5", "SoundChannel1")); keymaps.push_back(strpair_t("K00:C+F5", "SoundChannel1"));
keymaps.push_back(strpair_t("K00:A+F6", "SoundChannel2")); keymaps.push_back(strpair_t("K00:A+F6", "SoundChannel2"));
keymaps.push_back(strpair_t("K00:C+F6", "SoundChannel2")); keymaps.push_back(strpair_t("K00:C+F6", "SoundChannel2"));
keymaps.push_back(strpair_t("K00:A+F7", "SoundChannel3")); keymaps.push_back(strpair_t("K00:A+F7", "SoundChannel3"));
keymaps.push_back(strpair_t("K00:C+F7", "SoundChannel3")); keymaps.push_back(strpair_t("K00:C+F7", "SoundChannel3"));
keymaps.push_back(strpair_t("K00:A+F8", "SoundChannel4")); keymaps.push_back(strpair_t("K00:A+F8", "SoundChannel4"));
keymaps.push_back(strpair_t("K00:C+F8", "SoundChannel4")); keymaps.push_back(strpair_t("K00:C+F8", "SoundChannel4"));
keymaps.push_back(strpair_t("K00:A+F9", "SoundChannel5")); keymaps.push_back(strpair_t("K00:A+F9", "SoundChannel5"));
keymaps.push_back(strpair_t("K00:C+F9", "SoundChannel5")); keymaps.push_back(strpair_t("K00:C+F9", "SoundChannel5"));
keymaps.push_back(strpair_t("K00:A+F10", "SoundChannel6")); keymaps.push_back(strpair_t("K00:A+F10", "SoundChannel6"));
keymaps.push_back(strpair_t("K00:C+F10", "SoundChannel6")); keymaps.push_back(strpair_t("K00:C+F10", "SoundChannel6"));
keymaps.push_back(strpair_t("K00:A+F11", "SoundChannel7")); keymaps.push_back(strpair_t("K00:A+F11", "SoundChannel7"));
keymaps.push_back(strpair_t("K00:C+F11", "SoundChannel7")); keymaps.push_back(strpair_t("K00:C+F11", "SoundChannel7"));
keymaps.push_back(strpair_t("K00:A+F12", "SoundChannelsOn")); keymaps.push_back(strpair_t("K00:A+F12", "SoundChannelsOn"));
keymaps.push_back(strpair_t("K00:C+F12", "SoundChannelsOn")); keymaps.push_back(strpair_t("K00:C+F12", "SoundChannelsOn"));
keymaps.push_back(strpair_t("K00:S+1", "BeginRecordingMovie")); keymaps.push_back(strpair_t("K00:S+1", "BeginRecordingMovie"));
keymaps.push_back(strpair_t("K00:S+2", "EndRecordingMovie")); keymaps.push_back(strpair_t("K00:S+2", "EndRecordingMovie"));
keymaps.push_back(strpair_t("K00:S+3", "LoadMovie")); keymaps.push_back(strpair_t("K00:S+3", "LoadMovie"));
keymaps.push_back(strpair_t("K00:A+F1", "SaveSPC")); keymaps.push_back(strpair_t("K00:A+F1", "SaveSPC"));
keymaps.push_back(strpair_t("K00:C+F1", "SaveSPC")); keymaps.push_back(strpair_t("K00:C+F1", "SaveSPC"));
keymaps.push_back(strpair_t("K00:F10", "LoadOopsFile")); keymaps.push_back(strpair_t("K00:F10", "LoadOopsFile"));
keymaps.push_back(strpair_t("K00:A+F2", "LoadFreezeFile")); keymaps.push_back(strpair_t("K00:A+F2", "LoadFreezeFile"));
keymaps.push_back(strpair_t("K00:C+F2", "LoadFreezeFile")); keymaps.push_back(strpair_t("K00:C+F2", "LoadFreezeFile"));
keymaps.push_back(strpair_t("K00:F11", "LoadFreezeFile")); keymaps.push_back(strpair_t("K00:F11", "LoadFreezeFile"));
keymaps.push_back(strpair_t("K00:A+F3", "SaveFreezeFile")); keymaps.push_back(strpair_t("K00:A+F3", "SaveFreezeFile"));
keymaps.push_back(strpair_t("K00:C+F3", "SaveFreezeFile")); keymaps.push_back(strpair_t("K00:C+F3", "SaveFreezeFile"));
keymaps.push_back(strpair_t("K00:F12", "SaveFreezeFile")); keymaps.push_back(strpair_t("K00:F12", "SaveFreezeFile"));
keymaps.push_back(strpair_t("K00:F1", "QuickLoad000")); keymaps.push_back(strpair_t("K00:F1", "QuickLoad000"));
keymaps.push_back(strpair_t("K00:F2", "QuickLoad001")); keymaps.push_back(strpair_t("K00:F2", "QuickLoad001"));
keymaps.push_back(strpair_t("K00:F3", "QuickLoad002")); keymaps.push_back(strpair_t("K00:F3", "QuickLoad002"));
keymaps.push_back(strpair_t("K00:F4", "QuickLoad003")); keymaps.push_back(strpair_t("K00:F4", "QuickLoad003"));
keymaps.push_back(strpair_t("K00:F5", "QuickLoad004")); keymaps.push_back(strpair_t("K00:F5", "QuickLoad004"));
keymaps.push_back(strpair_t("K00:F6", "QuickLoad005")); keymaps.push_back(strpair_t("K00:F6", "QuickLoad005"));
keymaps.push_back(strpair_t("K00:F7", "QuickLoad006")); keymaps.push_back(strpair_t("K00:F7", "QuickLoad006"));
keymaps.push_back(strpair_t("K00:F8", "QuickLoad007")); keymaps.push_back(strpair_t("K00:F8", "QuickLoad007"));
keymaps.push_back(strpair_t("K00:F9", "QuickLoad008")); keymaps.push_back(strpair_t("K00:F9", "QuickLoad008"));
keymaps.push_back(strpair_t("K00:S+F1", "QuickSave000")); keymaps.push_back(strpair_t("K00:S+F1", "QuickSave000"));
keymaps.push_back(strpair_t("K00:S+F2", "QuickSave001")); keymaps.push_back(strpair_t("K00:S+F2", "QuickSave001"));
keymaps.push_back(strpair_t("K00:S+F3", "QuickSave002")); keymaps.push_back(strpair_t("K00:S+F3", "QuickSave002"));
keymaps.push_back(strpair_t("K00:S+F4", "QuickSave003")); keymaps.push_back(strpair_t("K00:S+F4", "QuickSave003"));
keymaps.push_back(strpair_t("K00:S+F5", "QuickSave004")); keymaps.push_back(strpair_t("K00:S+F5", "QuickSave004"));
keymaps.push_back(strpair_t("K00:S+F6", "QuickSave005")); keymaps.push_back(strpair_t("K00:S+F6", "QuickSave005"));
keymaps.push_back(strpair_t("K00:S+F7", "QuickSave006")); keymaps.push_back(strpair_t("K00:S+F7", "QuickSave006"));
keymaps.push_back(strpair_t("K00:S+F8", "QuickSave007")); keymaps.push_back(strpair_t("K00:S+F8", "QuickSave007"));
keymaps.push_back(strpair_t("K00:S+F9", "QuickSave008")); keymaps.push_back(strpair_t("K00:S+F9", "QuickSave008"));
keymaps.push_back(strpair_t("K00:Scroll_Lock", "Pause")); keymaps.push_back(strpair_t("K00:Scroll_Lock", "Pause"));
keymaps.push_back(strpair_t("K00:CS+Escape", "Reset")); keymaps.push_back(strpair_t("K00:CS+Escape", "Reset"));
keymaps.push_back(strpair_t("K00:S+Escape", "SoftReset")); keymaps.push_back(strpair_t("K00:S+Escape", "SoftReset"));
keymaps.push_back(strpair_t("K00:Escape", "ExitEmu")); keymaps.push_back(strpair_t("K00:Escape", "ExitEmu"));
keymaps.push_back(strpair_t("K00:Tab", "EmuTurbo")); keymaps.push_back(strpair_t("K00:Tab", "EmuTurbo"));
keymaps.push_back(strpair_t("K00:S+Tab", "ToggleEmuTurbo")); keymaps.push_back(strpair_t("K00:S+Tab", "ToggleEmuTurbo"));
keymaps.push_back(strpair_t("K00:A+equal", "IncEmuTurbo")); keymaps.push_back(strpair_t("K00:A+equal", "IncEmuTurbo"));
keymaps.push_back(strpair_t("K00:A+minus", "DecEmuTurbo")); keymaps.push_back(strpair_t("K00:A+minus", "DecEmuTurbo"));
keymaps.push_back(strpair_t("K00:C+equal", "IncTurboSpeed")); keymaps.push_back(strpair_t("K00:C+equal", "IncTurboSpeed"));
keymaps.push_back(strpair_t("K00:C+minus", "DecTurboSpeed")); keymaps.push_back(strpair_t("K00:C+minus", "DecTurboSpeed"));
keymaps.push_back(strpair_t("K00:equal", "IncFrameRate")); keymaps.push_back(strpair_t("K00:equal", "IncFrameRate"));
keymaps.push_back(strpair_t("K00:minus", "DecFrameRate")); keymaps.push_back(strpair_t("K00:minus", "DecFrameRate"));
keymaps.push_back(strpair_t("K00:S+equal", "IncFrameTime")); keymaps.push_back(strpair_t("K00:S+equal", "IncFrameTime"));
keymaps.push_back(strpair_t("K00:S+minus", "DecFrameTime")); keymaps.push_back(strpair_t("K00:S+minus", "DecFrameTime"));
keymaps.push_back(strpair_t("K00:6", "SwapJoypads")); keymaps.push_back(strpair_t("K00:6", "SwapJoypads"));
keymaps.push_back(strpair_t("K00:Print", "Screenshot")); keymaps.push_back(strpair_t("K00:Print", "Screenshot"));
keymaps.push_back(strpair_t("K00:1", "ToggleBG0")); keymaps.push_back(strpair_t("K00:1", "ToggleBG0"));
keymaps.push_back(strpair_t("K00:2", "ToggleBG1")); keymaps.push_back(strpair_t("K00:2", "ToggleBG1"));
keymaps.push_back(strpair_t("K00:3", "ToggleBG2")); keymaps.push_back(strpair_t("K00:3", "ToggleBG2"));
keymaps.push_back(strpair_t("K00:4", "ToggleBG3")); keymaps.push_back(strpair_t("K00:4", "ToggleBG3"));
keymaps.push_back(strpair_t("K00:5", "ToggleSprites")); keymaps.push_back(strpair_t("K00:5", "ToggleSprites"));
keymaps.push_back(strpair_t("K00:9", "ToggleTransparency")); keymaps.push_back(strpair_t("K00:9", "ToggleTransparency"));
keymaps.push_back(strpair_t("K00:BackSpace", "ClipWindows")); keymaps.push_back(strpair_t("K00:BackSpace", "ClipWindows"));
keymaps.push_back(strpair_t("K00:A+Escape", "Debugger")); keymaps.push_back(strpair_t("K00:A+Escape", "Debugger"));
keymaps.push_back(strpair_t("M00:B0", "{Mouse1 L,Superscope Fire,Justifier1 Trigger}")); keymaps.push_back(strpair_t("M00:B0", "{Mouse1 L,Superscope Fire,Justifier1 Trigger}"));
keymaps.push_back(strpair_t("M00:B1", "{Justifier1 AimOffscreen Trigger,Superscope AimOffscreen}")); keymaps.push_back(strpair_t("M00:B1", "{Justifier1 AimOffscreen Trigger,Superscope AimOffscreen}"));
keymaps.push_back(strpair_t("M00:B2", "{Mouse1 R,Superscope Cursor,Justifier1 Start}")); keymaps.push_back(strpair_t("M00:B2", "{Mouse1 R,Superscope Cursor,Justifier1 Start}"));
keymaps.push_back(strpair_t("M00:Pointer", "Pointer Mouse1+Superscope+Justifier1")); keymaps.push_back(strpair_t("M00:Pointer", "Pointer Mouse1+Superscope+Justifier1"));
keymaps.push_back(strpair_t("K00:grave", "Superscope ToggleTurbo")); keymaps.push_back(strpair_t("K00:grave", "Superscope ToggleTurbo"));
keymaps.push_back(strpair_t("K00:slash", "Superscope Pause")); keymaps.push_back(strpair_t("K00:slash", "Superscope Pause"));
keymaps.push_back(strpair_t("K00:r", "Rewind")); keymaps.push_back(strpair_t("K00:r", "Rewind"));
} }
GUI.no_repeat = !conf.GetBool("Unix/X11::SetKeyRepeat", TRUE); GUI.no_repeat = !conf.GetBool("Unix/X11::SetKeyRepeat", TRUE);
@ -510,9 +510,9 @@ void S9xInitDisplay (int argc, char **argv)
if (GUI.display == NULL) if (GUI.display == NULL)
FatalError("Failed to connect to X server."); FatalError("Failed to connect to X server.");
GUI.screen = DefaultScreenOfDisplay(GUI.display); GUI.screen = DefaultScreenOfDisplay(GUI.display);
GUI.screen_num = XScreenNumberOfScreen(GUI.screen); GUI.screen_num = XScreenNumberOfScreen(GUI.screen);
GUI.visual = DefaultVisualOfScreen(GUI.screen); GUI.visual = DefaultVisualOfScreen(GUI.screen);
XVisualInfo plate, *matches; XVisualInfo plate, *matches;
int count; int count;
@ -526,12 +526,12 @@ void S9xInitDisplay (int argc, char **argv)
if ((GUI.depth != 15 && GUI.depth != 16 && GUI.depth != 24) || (matches[0].c_class != TrueColor)) if ((GUI.depth != 15 && GUI.depth != 16 && GUI.depth != 24) || (matches[0].c_class != TrueColor))
FatalError("Requiers 15, 16, 24 or 32-bit color depth supporting TrueColor."); FatalError("Requiers 15, 16, 24 or 32-bit color depth supporting TrueColor.");
GUI.red_shift = ffs(matches[0].red_mask) - 1; GUI.red_shift = ffs(matches[0].red_mask) - 1;
GUI.green_shift = ffs(matches[0].green_mask) - 1; GUI.green_shift = ffs(matches[0].green_mask) - 1;
GUI.blue_shift = ffs(matches[0].blue_mask) - 1; GUI.blue_shift = ffs(matches[0].blue_mask) - 1;
GUI.red_size = matches[0].red_mask >> GUI.red_shift; GUI.red_size = matches[0].red_mask >> GUI.red_shift;
GUI.green_size = matches[0].green_mask >> GUI.green_shift; GUI.green_size = matches[0].green_mask >> GUI.green_shift;
GUI.blue_size = matches[0].blue_mask >> GUI.blue_shift; GUI.blue_size = matches[0].blue_mask >> GUI.blue_shift;
if (GUI.depth == 16 && GUI.green_size == 63) if (GUI.depth == 16 && GUI.green_size == 63)
GUI.green_shift++; GUI.green_shift++;
@ -596,7 +596,7 @@ void S9xInitDisplay (int argc, char **argv)
GUI.depth, InputOutput, GUI.visual, CWBackPixel | CWColormap, &attrib); GUI.depth, InputOutput, GUI.visual, CWBackPixel | CWColormap, &attrib);
/* Try to tell the Window Manager not to decorate this window. */ /* Try to tell the Window Manager not to decorate this window. */
Atom wm_state = XInternAtom (GUI.display, "_NET_WM_STATE", true ); Atom wm_state = XInternAtom (GUI.display, "_NET_WM_STATE", true );
Atom wm_fullscreen = XInternAtom (GUI.display, "_NET_WM_STATE_FULLSCREEN", true ); Atom wm_fullscreen = XInternAtom (GUI.display, "_NET_WM_STATE_FULLSCREEN", true );
XChangeProperty(GUI.display, GUI.window, wm_state, XA_ATOM, 32, PropModeReplace, (unsigned char *)&wm_fullscreen, 1); XChangeProperty(GUI.display, GUI.window, wm_state, XA_ATOM, 32, PropModeReplace, (unsigned char *)&wm_fullscreen, 1);
@ -607,14 +607,14 @@ void S9xInitDisplay (int argc, char **argv)
} else { } else {
/* Create the window. */ /* Create the window. */
GUI.window = XCreateWindow(GUI.display, RootWindowOfScreen(GUI.screen), GUI.window = XCreateWindow(GUI.display, RootWindowOfScreen(GUI.screen),
(WidthOfScreen(GUI.screen) - SNES_WIDTH * 2) / 2, (HeightOfScreen(GUI.screen) - SNES_HEIGHT_EXTENDED * 2) / 2, (WidthOfScreen(GUI.screen) - SNES_WIDTH * 2) / 2, (HeightOfScreen(GUI.screen) - SNES_HEIGHT_EXTENDED * 2) / 2,
SNES_WIDTH * 2, SNES_HEIGHT_EXTENDED * 2, 0, GUI.depth, InputOutput, GUI.visual, CWBackPixel | CWColormap, &attrib); SNES_WIDTH * 2, SNES_HEIGHT_EXTENDED * 2, 0, GUI.depth, InputOutput, GUI.visual, CWBackPixel | CWColormap, &attrib);
/* Tell the Window Manager that we do not wish to be resizable */ /* Tell the Window Manager that we do not wish to be resizable */
XSizeHints Hints; XSizeHints Hints;
memset((void *) &Hints, 0, sizeof(XSizeHints)); memset((void *) &Hints, 0, sizeof(XSizeHints));
Hints.flags = PSize | PMinSize | PMaxSize; Hints.flags = PSize | PMinSize | PMaxSize;
Hints.min_width = Hints.max_width = Hints.base_width = SNES_WIDTH * 2; Hints.min_width = Hints.max_width = Hints.base_width = SNES_WIDTH * 2;
Hints.min_height = Hints.max_height = Hints.base_height = SNES_HEIGHT_EXTENDED * 2; Hints.min_height = Hints.max_height = Hints.base_height = SNES_HEIGHT_EXTENDED * 2;
XSetWMNormalHints(GUI.display, GUI.window, &Hints); XSetWMNormalHints(GUI.display, GUI.window, &Hints);
@ -640,8 +640,8 @@ void S9xInitDisplay (int argc, char **argv)
memset((void *) &WMHints, 0, sizeof(XWMHints)); memset((void *) &WMHints, 0, sizeof(XWMHints));
/* Rely on the Window Manager to provide us with keyboard input */ /* Rely on the Window Manager to provide us with keyboard input */
WMHints.flags = InputHint; WMHints.flags = InputHint;
WMHints.input = True; WMHints.input = True;
XSetWMHints(GUI.display, GUI.window, &WMHints); XSetWMHints(GUI.display, GUI.window, &WMHints);
XSelectInput(GUI.display, GUI.window, FocusChangeMask | ExposureMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask | ButtonPressMask | ButtonReleaseMask); XSelectInput(GUI.display, GUI.window, FocusChangeMask | ExposureMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask | ButtonPressMask | ButtonReleaseMask);
@ -811,14 +811,14 @@ static void SetupImage (void)
if (GUI.depth == 15 || GUI.depth == 16) if (GUI.depth == 15 || GUI.depth == 16)
{ {
GUI.blit_screen_pitch = GUI.image->bytes_per_line; GUI.blit_screen_pitch = GUI.image->bytes_per_line;
GUI.blit_screen = (uint8 *) GUI.image->data; GUI.blit_screen = (uint8 *) GUI.image->data;
GUI.need_convert = FALSE; GUI.need_convert = FALSE;
} }
else else
{ {
GUI.blit_screen_pitch = (SNES_WIDTH * 2) * 2; GUI.blit_screen_pitch = (SNES_WIDTH * 2) * 2;
GUI.blit_screen = GUI.filter_buffer; GUI.blit_screen = GUI.filter_buffer;
GUI.need_convert = TRUE; GUI.need_convert = TRUE;
} }
S9xGraphicsInit(); S9xGraphicsInit();
@ -1203,13 +1203,13 @@ s9xcommand_t S9xGetDisplayCommandT (const char *n)
{ {
s9xcommand_t cmd; s9xcommand_t cmd;
cmd.type = S9xBadMapping; cmd.type = S9xBadMapping;
cmd.multi_press = 0; cmd.multi_press = 0;
cmd.button_norpt = 0; cmd.button_norpt = 0;
cmd.port[0] = 0xff; cmd.port[0] = 0xff;
cmd.port[1] = 0; cmd.port[1] = 0;
cmd.port[2] = 0; cmd.port[2] = 0;
cmd.port[3] = 0; cmd.port[3] = 0;
return (cmd); return (cmd);
} }
@ -1252,10 +1252,10 @@ bool8 S9xMapDisplayInput (const char *n, s9xcommand_t *cmd)
{ {
switch (n[i]) switch (n[i])
{ {
case 'S': d |= ShiftMask << 8; break; case 'S': d |= ShiftMask << 8; break;
case 'C': d |= ControlMask << 8; break; case 'C': d |= ControlMask << 8; break;
case 'A': d |= Mod1Mask << 8; break; case 'A': d |= Mod1Mask << 8; break;
case 'M': d |= Mod4Mask << 8; break; case 'M': d |= Mod4Mask << 8; break;
default: goto unrecog; default: goto unrecog;
} }
} }