From 3043d3db91c3a541881aa951bbd4f8ccb5e3ce40 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Wed, 5 Sep 2007 12:35:19 +0000 Subject: modified ParseInput so Backspace will perform same function as ESC in most screens ( Except where text input is required, and backspace is used for text input ) This has been done, so that when used with Windows Media Center IR Remotes ( needs SDL 1.2 dll at runtime ) users can navigate throug the game without sitting in front of the PC keyboard. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@370 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenCredits.pas | 4 +++- Game/Code/Screens/UScreenEdit.pas | 4 +++- Game/Code/Screens/UScreenEditConvert.pas | 4 +++- Game/Code/Screens/UScreenEditHeader.pas | 1 + Game/Code/Screens/UScreenEditSub.pas | 8 ++++++-- Game/Code/Screens/UScreenLevel.pas | 3 ++- Game/Code/Screens/UScreenMain.pas | 3 ++- Game/Code/Screens/UScreenOpen.pas | 3 ++- Game/Code/Screens/UScreenOptions.pas | 4 +++- Game/Code/Screens/UScreenOptionsAdvanced.pas | 4 +++- Game/Code/Screens/UScreenOptionsGame.pas | 4 +++- Game/Code/Screens/UScreenOptionsGraphics.pas | 4 +++- Game/Code/Screens/UScreenOptionsLyrics.pas | 4 +++- Game/Code/Screens/UScreenOptionsRecord.pas | 3 ++- Game/Code/Screens/UScreenOptionsSound.pas | 4 +++- Game/Code/Screens/UScreenOptionsThemes.pas | 4 +++- Game/Code/Screens/UScreenPartyNewRound.pas | 4 +++- Game/Code/Screens/UScreenPartyOptions.pas | 4 +++- Game/Code/Screens/UScreenPartyPlayer.pas | 2 +- Game/Code/Screens/UScreenPartyScore.pas | 4 +++- Game/Code/Screens/UScreenPartyWin.pas | 4 +++- Game/Code/Screens/UScreenPopup.pas | 6 ++++-- Game/Code/Screens/UScreenScore.pas | 4 +++- Game/Code/Screens/UScreenSing.pas | 4 +++- Game/Code/Screens/UScreenSingModi.pas | 4 +++- Game/Code/Screens/UScreenSong.pas | 4 +++- Game/Code/Screens/UScreenSongJumpto.pas | 3 ++- Game/Code/Screens/UScreenSongMenu.pas | 4 +++- Game/Code/Screens/UScreenStatDetail.pas | 4 +++- Game/Code/Screens/UScreenStatMain.pas | 4 +++- Game/Code/Screens/UScreenTop5.pas | 5 ++++- Game/Code/Screens/UScreenWelcome.pas | 3 ++- 32 files changed, 91 insertions(+), 33 deletions(-) (limited to 'Game/Code/Screens') diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas index a0ef01af..deaa042e 100644 --- a/Game/Code/Screens/UScreenCredits.pas +++ b/Game/Code/Screens/UScreenCredits.pas @@ -112,7 +112,9 @@ begin If (PressedDown) Then begin // Key Down case PressedKey of - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin FadeTo(@ScreenMain); Music.PlayBack; diff --git a/Game/Code/Screens/UScreenEdit.pas b/Game/Code/Screens/UScreenEdit.pas index ac2964cd..93c2a5b4 100644 --- a/Game/Code/Screens/UScreenEdit.pas +++ b/Game/Code/Screens/UScreenEdit.pas @@ -32,7 +32,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; FadeTo(@ScreenMain); diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas index f1e3ba32..791f8e50 100644 --- a/Game/Code/Screens/UScreenEditConvert.pas +++ b/Game/Code/Screens/UScreenEditConvert.pas @@ -83,7 +83,9 @@ begin Result := false; end; - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin MidiFile.StopPlaying; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas index 35d7840f..a7105b0e 100644 --- a/Game/Code/Screens/UScreenEditHeader.pas +++ b/Game/Code/Screens/UScreenEditHeader.pas @@ -57,6 +57,7 @@ begin begin Result := false; end; + SDLK_ESCAPE : begin // Music.PlayBack; diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index 9ca45f55..1d5cc66d 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -94,7 +94,9 @@ begin If (PressedDown) then begin // Key Down case PressedKey of - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin FadeTo(@ScreenSong); end; @@ -565,7 +567,9 @@ begin If (PressedDown) Then begin // Key Down case PressedKey of - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin FadeTo(@ScreenSong); end; diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas index fc343042..34fc87af 100644 --- a/Game/Code/Screens/UScreenLevel.pas +++ b/Game/Code/Screens/UScreenLevel.pas @@ -29,7 +29,8 @@ begin Result := false; end; - SDLK_ESCAPE : + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; FadeTo(@ScreenName); diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas index 085f253d..3d591a5c 100644 --- a/Game/Code/Screens/UScreenMain.pas +++ b/Game/Code/Screens/UScreenMain.pas @@ -53,7 +53,8 @@ begin Result := false; end; - SDLK_ESCAPE : + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Result := False; end; diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas index af984a21..68667d87 100644 --- a/Game/Code/Screens/UScreenOpen.pas +++ b/Game/Code/Screens/UScreenOpen.pas @@ -52,7 +52,8 @@ begin end; end; - SDLK_ESCAPE: + + SDLK_ESCAPE : begin //Empty Filename and go to last Screen FileName := ''; diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas index 02d42568..a1f64659 100644 --- a/Game/Code/Screens/UScreenOptions.pas +++ b/Game/Code/Screens/UScreenOptions.pas @@ -31,7 +31,9 @@ begin begin Result := false; end; - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas index 9cac8c5e..63c3aa7a 100644 --- a/Game/Code/Screens/UScreenOptionsAdvanced.pas +++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas @@ -27,7 +27,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas index 8712decc..0f69f326 100644 --- a/Game/Code/Screens/UScreenOptionsGame.pas +++ b/Game/Code/Screens/UScreenOptionsGame.pas @@ -29,7 +29,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; RefreshSongs; diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas index c0641fc2..d4be6974 100644 --- a/Game/Code/Screens/UScreenOptionsGraphics.pas +++ b/Game/Code/Screens/UScreenOptionsGraphics.pas @@ -27,7 +27,9 @@ begin begin Result := false; end; - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas index f4044933..5cadc5b9 100644 --- a/Game/Code/Screens/UScreenOptionsLyrics.pas +++ b/Game/Code/Screens/UScreenOptionsLyrics.pas @@ -27,7 +27,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas index b005492a..2ff989fa 100644 --- a/Game/Code/Screens/UScreenOptionsRecord.pas +++ b/Game/Code/Screens/UScreenOptionsRecord.pas @@ -32,7 +32,8 @@ begin begin Result := false; end; - SDLK_ESCAPE, SDLK_BACKSPACE: + SDLK_ESCAPE, + SDLK_BACKSPACE: begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas index fb04ab64..3c3e28e4 100644 --- a/Game/Code/Screens/UScreenOptionsSound.pas +++ b/Game/Code/Screens/UScreenOptionsSound.pas @@ -27,7 +27,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas index b73693c1..5b5f8877 100644 --- a/Game/Code/Screens/UScreenOptionsThemes.pas +++ b/Game/Code/Screens/UScreenOptionsThemes.pas @@ -30,7 +30,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas index f084ee10..938aacfb 100644 --- a/Game/Code/Screens/UScreenPartyNewRound.pas +++ b/Game/Code/Screens/UScreenPartyNewRound.pas @@ -83,7 +83,9 @@ begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; CheckFadeTo(@ScreenMain,'MSG_END_PARTY'); diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas index 49cc8c53..493f3939 100644 --- a/Game/Code/Screens/UScreenPartyOptions.pas +++ b/Game/Code/Screens/UScreenPartyOptions.pas @@ -55,7 +55,9 @@ begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; FadeTo(@ScreenMain); diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas index d6859775..e6830ee6 100644 --- a/Game/Code/Screens/UScreenPartyPlayer.pas +++ b/Game/Code/Screens/UScreenPartyPlayer.pas @@ -181,7 +181,7 @@ begin Button[Interaction].Text[0].DeleteLastL; end; - SDLK_ESCAPE : + SDLK_ESCAPE: begin Ini.SaveNames; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas index 5c632356..6333896c 100644 --- a/Game/Code/Screens/UScreenPartyScore.pas +++ b/Game/Code/Screens/UScreenPartyScore.pas @@ -53,7 +53,9 @@ begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayStart; if (PartySession.CurRound < High(PartySession.Rounds)) then diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas index 76d0420f..fecca3d1 100644 --- a/Game/Code/Screens/UScreenPartyWin.pas +++ b/Game/Code/Screens/UScreenPartyWin.pas @@ -46,7 +46,9 @@ begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayStart; FadeTo(@ScreenMain); diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas index 2a789e42..f583eb90 100644 --- a/Game/Code/Screens/UScreenPopup.pas +++ b/Game/Code/Screens/UScreenPopup.pas @@ -53,7 +53,8 @@ begin Result := false; end; - SDLK_ESCAPE : + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Display.CheckOK:=False; Display.NextScreenWithCheck:=NIL; @@ -159,7 +160,8 @@ begin Result := false; end; - SDLK_ESCAPE : + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Visible:=False; Result := false; diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas index af1ccb59..2fdccf8e 100644 --- a/Game/Code/Screens/UScreenScore.pas +++ b/Game/Code/Screens/UScreenScore.pas @@ -64,7 +64,9 @@ begin Result := false; end; - SDLK_ESCAPE : + SDLK_ESCAPE, + SDLK_BACKSPACE : + begin if (not Fadeout) then begin // Music.StopShuffle; diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index 6ce19c17..8291a430 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -103,7 +103,9 @@ begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin //Record Sound Hack: //Sound[0].BufferLong diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas index 0b9ab893..e046e193 100644 --- a/Game/Code/Screens/UScreenSingModi.pas +++ b/Game/Code/Screens/UScreenSingModi.pas @@ -73,7 +73,9 @@ begin If (PressedDown) Then begin // Key Down case PressedKey of - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Finish; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index cddf864e..38266797 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -269,7 +269,9 @@ begin begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin if (Mode = 0) then begin diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas index 7103257d..48d23468 100644 --- a/Game/Code/Screens/UScreenSongJumpto.pas +++ b/Game/Code/Screens/UScreenSongJumpto.pas @@ -61,7 +61,8 @@ begin end; end; - SDLK_RETURN, SDLK_ESCAPE: + SDLK_RETURN, + SDLK_ESCAPE: begin Visible := False; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas index 06b8f183..9fe70522 100644 --- a/Game/Code/Screens/UScreenSongMenu.pas +++ b/Game/Code/Screens/UScreenSongMenu.pas @@ -73,7 +73,9 @@ begin Result := false; end; - SDLK_ESCAPE : + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; Visible := False; diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas index 1461a9da..9dc6c525 100644 --- a/Game/Code/Screens/UScreenStatDetail.pas +++ b/Game/Code/Screens/UScreenStatDetail.pas @@ -47,7 +47,9 @@ begin begin Result := false; end; - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Music.PlayBack; FadeTo(@ScreenStatMain); diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas index b3907d41..86d7d561 100644 --- a/Game/Code/Screens/UScreenStatMain.pas +++ b/Game/Code/Screens/UScreenStatMain.pas @@ -34,7 +34,9 @@ begin begin Result := false; end; - SDLK_ESCAPE: + + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Ini.Save; Music.PlayBack; diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas index 4d542bf0..0f758db6 100644 --- a/Game/Code/Screens/UScreenTop5.pas +++ b/Game/Code/Screens/UScreenTop5.pas @@ -37,7 +37,10 @@ begin Result := false; end; - SDLK_ESCAPE, SDLK_RETURN: + + SDLK_ESCAPE, + SDLK_BACKSPACE : + SDLK_RETURN: begin if (not Fadeout) then begin FadeTo(@ScreenSong); diff --git a/Game/Code/Screens/UScreenWelcome.pas b/Game/Code/Screens/UScreenWelcome.pas index 79fcc2c4..35e159f8 100644 --- a/Game/Code/Screens/UScreenWelcome.pas +++ b/Game/Code/Screens/UScreenWelcome.pas @@ -25,7 +25,8 @@ begin Result := true; If (PressedDown) Then begin case PressedKey of - SDLK_ESCAPE : + SDLK_ESCAPE, + SDLK_BACKSPACE : begin Result := False; end; -- cgit v1.2.3