Skip to content

Add new mappable key to pause without the pause menu. #19883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrydgard merged 1 commit into from
Jan 17, 2025
Merged

Add new mappable key to pause without the pause menu. #19883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Core/KeyMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@ const KeyMap_IntStrPair psp_button_names[] = {

{VIRTKEY_FASTFORWARD, "Fast-forward"},
{VIRTKEY_PAUSE, "Pause"},
{VIRTKEY_PAUSE_NO_MENU, "Pause (no menu)"},

{VIRTKEY_SPEED_TOGGLE, "SpeedToggle"},
{VIRTKEY_SPEED_CUSTOM1, "Alt speed 1"},
{VIRTKEY_SPEED_CUSTOM2, "Alt speed 2"},
Expand Down
1 change: 1 addition & 0 deletions Core/KeyMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ enum {
VIRTKEY_TOGGLE_TOUCH_CONTROLS = 0x40000031,
VIRTKEY_RESET_EMULATION = 0x40000032,
VIRTKEY_TOGGLE_DEBUGGER = 0x40000033,
VIRTKEY_PAUSE_NO_MENU = 0x40000034,
VIRTKEY_LAST,
VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
};
Expand Down
12 changes: 12 additions & 0 deletions UI/EmuScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,8 +742,20 @@ void EmuScreen::onVKey(int virtualKeyCode, bool down) {
}
break;

case VIRTKEY_PAUSE_NO_MENU:
if (down && !NetworkWarnUserIfOnlineAndCantSpeed()) {
// We re-use debug break/resume to implement pause/resume without a menu.
if (coreState == CORE_STEPPING_CPU) {
Core_Resume();
} else {
Core_Break("user-pause");
}
}
break;

case VIRTKEY_FRAME_ADVANCE:
// Can't do this reliably in an async fashion, so we just set a variable.
// Is this used by anyone? There's no good way to resume, other than PAUSE_NO_MENU or the debugger.
if (down && !NetworkWarnUserIfOnlineAndCantSpeed()) {
doFrameAdvance_.store(true);
}
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ar_AE.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ Next Slot = Next slot
None = None
Note = Note
OpenChat = فتح المحادثة
Pause (no menu) = ‎توقف مؤقت
Pause = ‎توقف مؤقت
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/az_AZ.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/bg_BG.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Пауза (no menu)
Pause = Пауза
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ca_ES.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/cz_CZ.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Další pozice
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pauza (no menu)
Pause = Pauza
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/da_DK.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Næste Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/de_DE.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Nächster Stand
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/dr_ID.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Paus (no menu)
Pause = Paus
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/en_US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,7 @@ Next Slot = Next slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/es_ES.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ Next Slot = Siguiente ranura
None = Ninguno
Note = Nota
OpenChat = Abrir Chat
Pause (no menu) = Pausa (no menu)
Pause = Pausa
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/es_LA.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Siguiente ranura
None = Ninguno
Note = Sonido
OpenChat = Abrir chat
Pause (no menu) = Pausa
Pause = Pausa
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/fa_IR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/fi_FI.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Seuraava lohko
None = Ei mitään
Note = Note
OpenChat = Avaa keskustelu
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Edellinen lohko
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/fr_FR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Emplacement suivant
None = Aucun
Note = Note
OpenChat = Ouvrir chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/gl_ES.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Seguinte ranura
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pausa
Pause = Pausa
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/gr_EL.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Επόμενο Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Πάυση
Pause = Πάυση
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/he_IL.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = עצור (no menu)
Pause = עצור
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/he_IL_invert.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = עצור (no menu)
Pause = עצור
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/hr_HR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Sljedeći slot
None = None
Note = Note
OpenChat = Otvori chat
Pause (no menu) = Pauza (no menu)
Pause = Pauza
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/hu_HU.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Következő áll.mentés
None = Nincs
Note = Hangjegy
OpenChat = Chat
Pause (no menu) = Szünet (no menu)
Pause = Szünet
Previous Slot = Előző áll.mentés
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/id_ID.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Slot berikutnya
None = Tidak ada
Note = Catatan
OpenChat = Buka obrolan
Pause (no menu) = Jeda (no menu)
Pause = Jeda
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/it_IT.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,7 @@ Next Slot = Slot successivo
None = Niente
Note = Nota
OpenChat = Apri la chat
Pause (no menu) = Pausa (no menu)
Pause = Pausa
Previous Slot = Slot precedente
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ja_JP.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = 次のスロット
None = 設定なし
Note = ♪ボタン
OpenChat = チャットを開く
Pause (no menu) = 一時停止 (no menu)
Pause = 一時停止
Previous Slot = 前のスロット
R = Ｒ
Expand Down
1 change: 1 addition & 0 deletions assets/lang/jv_ID.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Ngaso (no menu)
Pause = Ngaso
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ko_KR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ Next Slot = 다음 슬롯
None = 없음
Note = 참고
OpenChat = 채팅 열기
Pause (no menu) = 일시 정지 (no menu)
Pause = 일시 정지
Previous Slot = 이전 슬롯
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ku_SO.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ Next Slot = Next slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/lo_LA.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = ຊ່ອງຕໍ່ໄປ
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = ຢຸດຊົ່ວຄາວ (no menu)
Pause = ຢຸດຊົ່ວຄາວ
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/lt-LT.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pauzė
Pause = Pauzė
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ms_MY.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Jeda
Pause = Jeda
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/nl_NL.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Volgende sleuf
None = None
Note = Muzieknoot
OpenChat = Open chat
Pause (no menu) = Pauzeren
Pause = Pauzeren
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/no_NO.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Next Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pause (no menu)
Pause = Pause
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/pl_PL.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ Next Slot = Następny Slot
None = Nic
Note = Notka
OpenChat = Otwórz czat
Pause (no menu) = Pauza
Pause = Pauza
Previous Slot = Poprzedni Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/pt_BR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,7 @@ Next Slot = Próximo slot
None = Nenhum
Note = Nota
OpenChat = Abrir o bate-papo
Pause (no menu) = Pausar
Pause = Pausar
Previous Slot = Slot anterior
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/pt_PT.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,7 @@ Next Slot = Próximo Espaço
None = Nenhum
Note = Nota
OpenChat = Abrir o Bate-Papo
Pause (no menu) = Pausar
Pause = Pausar
Previous Slot = Slot anterior
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ro_RO.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ Next Slot = Slotul următor
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Pauză
Pause = Pauză
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/ru_RU.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = След. слот
None = Нет
Note = Нота
OpenChat = Открыть чат
Pause (no menu) = Пауза
Pause = Пауза
Previous Slot = Предыдущий слот
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/sv_SE.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ Next Slot = Nästa slot
None = None
Note = Not
OpenChat = Öppna chat
Pause (no menu) = Paus
Pause = Paus
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/tg_PH.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ Next Slot = Susunod na Save State Slot
None = Wala
Note = Nota
OpenChat = Buksan ang chat
Pause (no menu) = Hinto
Pause = Hinto
Previous Slot = Nakaraan na Save State Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/th_TH.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,7 @@ Next Slot = ช่องสเตทถัดไป
None = ไม่มี
Note = หมายเหตุ
OpenChat = เปิดแชท
Pause (no menu) = หยุดชั่วคราว
Pause = หยุดชั่วคราว
Previous Slot = ช่องสเตทอันที่แล้ว
R = อาร์
Expand Down
1 change: 1 addition & 0 deletions assets/lang/tr_TR.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,7 @@ Next Slot = Sonraki Slot
None = Hiçbiri
Note = Not
OpenChat = Sohbeti Aç
Pause (no menu) = Pause (no menu)
Pause = PPSSPP Menüsü
Previous Slot = Önceki Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/uk_UA.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Наст. слот
None = Нічого
Note = Примітка
OpenChat = Відкритий чат
Pause (no menu) = Пауза (no menu)
Pause = Пауза
Previous Slot = попередній слот
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/vi_VN.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = Slot tiếp
None = None
Note = Chú ý
OpenChat = Open chat
Pause (no menu) = Tạm dừng (no menu)
Pause = Tạm dừng
Previous Slot = Previous Slot
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/zh_CN.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ Next Slot = 下个即时存档槽
None = 无
Note = 音效键♪
OpenChat = 聊天窗口
Pause (no menu) = 暂停界面
Pause = 暂停界面
Previous Slot = 上个即时存档槽
R = R
Expand Down
1 change: 1 addition & 0 deletions assets/lang/zh_TW.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ Next Slot = 下一存檔插槽
None = 無
Note = 聲音按鈕
OpenChat = 開啟聊天
Pause (no menu) = 暫停 (no menu)
Pause = 暫停
Previous Slot = 上一存檔插槽
R = R
Expand Down
Loading