Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19883 from hrydgard/pause-without-menu

Browse source 
Add new mappable key to pause without the pause menu.
This commit is contained in:
Henrik Rydgård 2025-01-17 16:11:49 +01:00 • committed by GitHub
commit 60c98a6483
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
47 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/KeyMap.cpp
View file

@ -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"},

1
Core/KeyMap.h
View file

@ -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
};

12
UI/EmuScreen.cpp
View file

@ -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);
}

1
assets/lang/ar_AE.ini
View file

@ -831,6 +831,7 @@ Next Slot = Next slot
None = None
Note = Note
OpenChat = فتح المحادثة
Pause (no menu) = ‎توقف مؤقت
Pause = ‎توقف مؤقت
Previous Slot = Previous Slot
R = R

1
assets/lang/az_AZ.ini
View file

@ -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

1
assets/lang/bg_BG.ini
View file

@ -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

1
assets/lang/ca_ES.ini
View file

@ -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

1
assets/lang/cz_CZ.ini
View file

@ -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

1
assets/lang/da_DK.ini
View file

@ -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

1
assets/lang/de_DE.ini
View file

@ -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

1
assets/lang/dr_ID.ini
View file

@ -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

1
assets/lang/en_US.ini
View file

@ -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

1
assets/lang/es_ES.ini
View file

@ -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

1
assets/lang/es_LA.ini
View file

@ -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

1
assets/lang/fa_IR.ini
View file

@ -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

1
assets/lang/fi_FI.ini
View file

@ -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

1
assets/lang/fr_FR.ini
View file

@ -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

1
assets/lang/gl_ES.ini
View file

@ -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

1
assets/lang/gr_EL.ini
View file

@ -823,6 +823,7 @@ Next Slot = Επόμενο Slot
None = None
Note = Note
OpenChat = Open chat
Pause (no menu) = Πάυση
Pause = Πάυση
Previous Slot = Previous Slot
R = R

1
assets/lang/he_IL.ini
View file

@ -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

1
assets/lang/he_IL_invert.ini
View file

@ -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

1
assets/lang/hr_HR.ini
View file

@ -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

1
assets/lang/hu_HU.ini
View file

@ -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

1
assets/lang/id_ID.ini
View file

@ -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

1
assets/lang/it_IT.ini
View file

@ -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

1
assets/lang/ja_JP.ini
View file

@ -823,6 +823,7 @@ Next Slot = 次のスロット
None = 設定なし
Note = ♪ボタン
OpenChat = チャットを開く
Pause (no menu) = 一時停止 (no menu)
Pause = 一時停止
Previous Slot = 前のスロット
R = Ｒ

1
assets/lang/jv_ID.ini
View file

@ -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

1
assets/lang/ko_KR.ini
View file

@ -819,6 +819,7 @@ Next Slot = 다음 슬롯
None = 없음
Note = 참고
OpenChat = 채팅 열기
Pause (no menu) = 일시 정지 (no menu)
Pause = 일시 정지
Previous Slot = 이전 슬롯
R = R

1
assets/lang/ku_SO.ini
View file

@ -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

1
assets/lang/lo_LA.ini
View file

@ -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

1
assets/lang/lt-LT.ini
View file

@ -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

1
assets/lang/ms_MY.ini
View file

@ -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

1
assets/lang/nl_NL.ini
View file

@ -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

1
assets/lang/no_NO.ini
View file

@ -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

1
assets/lang/pl_PL.ini
View file

@ -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

1
assets/lang/pt_BR.ini
View file

@ -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

1
assets/lang/pt_PT.ini
View file

@ -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

1
assets/lang/ro_RO.ini
View file

@ -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

1
assets/lang/ru_RU.ini
View file

@ -823,6 +823,7 @@ Next Slot = След. слот
None = Нет
Note = Нота
OpenChat = Открыть чат
Pause (no menu) = Пауза
Pause = Пауза
Previous Slot = Предыдущий слот
R = R

1
assets/lang/sv_SE.ini
View file

@ -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

1
assets/lang/tg_PH.ini
View file

@ -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

1
assets/lang/th_TH.ini
View file

@ -841,6 +841,7 @@ Next Slot = ช่องสเตทถัดไป
None = ไม่มี
Note = หมายเหตุ
OpenChat = เปิดแชท
Pause (no menu) = หยุดชั่วคราว
Pause = หยุดชั่วคราว
Previous Slot = ช่องสเตทอันที่แล้ว
R = อาร์

1
assets/lang/tr_TR.ini
View file

@ -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

1
assets/lang/uk_UA.ini
View file

@ -823,6 +823,7 @@ Next Slot = Наст. слот
None = Нічого
Note = Примітка
OpenChat = Відкритий чат
Pause (no menu) = Пауза (no menu)
Pause = Пауза
Previous Slot = попередній слот
R = R

1
assets/lang/vi_VN.ini
View file

@ -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

1
assets/lang/zh_CN.ini
View file

@ -823,6 +823,7 @@ Next Slot = 下个即时存档槽
None = 无
Note = 音效键♪
OpenChat = 聊天窗口
Pause (no menu) = 暂停界面
Pause = 暂停界面
Previous Slot = 上个即时存档槽
R = R

1
assets/lang/zh_TW.ini
View file

@ -819,6 +819,7 @@ Next Slot = 下一存檔插槽
None = 無
Note = 聲音按鈕
OpenChat = 開啟聊天
Pause (no menu) = 暫停 (no menu)
Pause = 暫停
Previous Slot = 上一存檔插槽
R = R