BACKENDS: (PSP) Use standard ScummVM virtual keyboard

backends/platform/psp/default_display_client.h

@@ -22,6 +22,8 @@
 #ifndef PSP_DEF_DISPLAY_CLIENT_H
 #define PSP_DEF_DISPLAY_CLIENT_H
 
+#include "backends/platform/psp/display_client.h"
+
 /**
  *	Default display client that is useful for most purposes.
  */

backends/platform/psp/display_manager.cpp

@@ -31,7 +31,6 @@
 #include "backends/platform/psp/display_client.h"
 #include "backends/platform/psp/default_display_client.h"
 #include "backends/platform/psp/cursor.h"
-#include "backends/platform/psp/pspkeyboard.h"
 #include "backends/platform/psp/image_viewer.h"
 
 #include "common/config-manager.h"
@@ -404,7 +403,6 @@ bool DisplayManager::renderAll() {
 	if (!_screen->isDirty() &&
 		!_overlay->isDirty() &&
 		!_cursor->isDirty() &&
-		!_keyboard->isDirty() &&
 		!_imageViewer->isDirty()) {
 		PSP_DEBUG_PRINT("Nothing dirty\n");
 		return true;	// nothing to render
@@ -413,11 +411,10 @@ bool DisplayManager::renderAll() {
 	if (!isTimeToUpdate())
 		return false;	// didn't render
 
-	PSP_DEBUG_PRINT("dirty: screen[%s], overlay[%s], cursor[%s], keyboard[%s], imageViewer[%s]\n",
+	PSP_DEBUG_PRINT("dirty: screen[%s], overlay[%s], cursor[%s], imageViewer[%s]\n",
 	                _screen->isDirty() ? "true" : "false",
 	                _overlay->isDirty() ? "true" : "false",
 	                _cursor->isDirty() ? "true" : "false",
-	                _keyboard->isDirty() ? "true" : "false",
 					_imageViewer->isDirty() ? "true" : "false"
 	               );
 
@@ -438,10 +435,6 @@ bool DisplayManager::renderAll() {
 		_cursor->render();
 	_cursor->setClean();
 
-	if (_keyboard->isVisible())
-		_keyboard->render();
-	_keyboard->setClean();
-
 	_masterGuRenderer.guPostRender();
 
 	return true;	// rendered successfully

backends/platform/psp/display_manager.h

@@ -94,7 +94,6 @@ class MasterGuRenderer : public PspThreadable {
 class Screen;
 class Overlay;
 class Cursor;
-class PSPKeyboard;
 class ImageViewer;
 
 /**
@@ -107,7 +106,7 @@ class DisplayManager {
 		FIT_TO_SCREEN,
 		STRETCH_TO_SCREEN
 	};
-	DisplayManager() : _screen(0), _cursor(0), _overlay(0), _keyboard(0),
+	DisplayManager() : _screen(0), _cursor(0), _overlay(0),
 					  _imageViewer(0), _lastUpdateTime(0), _graphicsMode(0) {}
 	~DisplayManager();
 
@@ -123,7 +122,6 @@ class DisplayManager {
 	void setScreen(Screen *screen) { _screen = screen; }
 	void setCursor(Cursor *cursor) { _cursor = cursor; }
 	void setOverlay(Overlay *overlay) { _overlay = overlay; }
-	void setKeyboard(PSPKeyboard *keyboard) { _keyboard = keyboard; }
 	void setImageViewer(ImageViewer *imageViewer) { _imageViewer = imageViewer; }
 
 	void setSizeAndPixelFormat(uint width, uint height, const Graphics::PixelFormat *format);
@@ -150,7 +148,6 @@ class DisplayManager {
 	Screen *_screen;
 	Cursor *_cursor;
 	Overlay *_overlay;
-	PSPKeyboard *_keyboard;
 	ImageViewer *_imageViewer;
 
 	MasterGuRenderer _masterGuRenderer;

backends/platform/psp/input.cpp

@@ -150,7 +150,7 @@ void ButtonPad::initButtonsNormalMode() {
 	_button[BTN_RTRIGGER][UNSHIFTED].setKey(Common::KEYCODE_INVALID, 0, Common::KBD_SHIFT);
 	_button[BTN_START][SHIFTED].setKey(Common::KEYCODE_F5, Common::ASCII_F5);
 	_button[BTN_START][UNSHIFTED].setKey(Common::KEYCODE_F5, Common::ASCII_F5, Common::KBD_CTRL);
-	_button[BTN_SELECT][UNSHIFTED].setPspEvent(PSP_EVENT_SHOW_VIRTUAL_KB, true, PSP_EVENT_NONE, 0);
+	_button[BTN_SELECT][UNSHIFTED].setKey(Common::KEYCODE_F7, Common::ASCII_F7, Common::KBD_CTRL);
 	_button[BTN_SELECT][SHIFTED].setPspEvent(PSP_EVENT_IMAGE_VIEWER, true, PSP_EVENT_NONE, 0);
 }
 
@@ -449,11 +449,7 @@ bool InputHandler::getEvent(Common::Event &event, SceCtrlData &pad) {
 	PspEvent pspEvent;
 	bool haveEvent = false;
 
-	if (_keyboard->isVisible()) {
-		haveEvent = _keyboard->processInput(event, pspEvent, pad);
-	} else {	// only process buttonpad if keyboard invisible
-		haveEvent = _buttonPad.getEvent(event, pspEvent, pad);
-	}
+	haveEvent = _buttonPad.getEvent(event, pspEvent, pad);
 
 	if (!haveEvent && pspEvent.isEmpty())
 		haveEvent = _nub.getEvent(event, pspEvent, pad);
@@ -482,11 +478,6 @@ bool InputHandler::handlePspEvent(Common::Event &event, PspEvent &pspEvent) {
 	case PSP_EVENT_SHIFT:
 		handleShiftEvent((ShiftMode)pspEvent.data);
 		break;
-	case PSP_EVENT_SHOW_VIRTUAL_KB:
-		_keyboard->setVisible((bool)pspEvent.data);
-		if ((pspEvent.data && _keyboard->isVisible()) || !pspEvent.data) 	// don't change mode if keyboard didn't load
-			_nub.setDpadMode((bool)pspEvent.data);							// set nub to keypad/regular mode
-		break;
 	case PSP_EVENT_LBUTTON:
 		haveEvent = true;
 		if (pspEvent.data) // down

backends/platform/psp/input.h

@@ -24,7 +24,6 @@
 
 #include "common/scummsys.h"
 #include "common/events.h"
-#include "backends/platform/psp/pspkeyboard.h"
 #include "backends/platform/psp/cursor.h"
 #include "backends/platform/psp/image_viewer.h"
 #include <pspctrl.h>
@@ -164,10 +163,9 @@ class Nub {
 
 class InputHandler {
 public:
-	InputHandler() : _keyboard(0), _cursor(0), _imageViewer(0), _padMode(PAD_MODE_NORMAL),
+	InputHandler() : _cursor(0), _imageViewer(0), _padMode(PAD_MODE_NORMAL),
 					 _lastPadCheckTime(0) {}
 	// pointer setters
-	void setKeyboard(PSPKeyboard *keyboard) { _keyboard = keyboard; }
 	void setCursor(Cursor *cursor) { _cursor = cursor; _nub.setCursor(cursor); }
 	void setImageViewer(ImageViewer *imageViewer) { _imageViewer = imageViewer; }
 
@@ -180,7 +178,6 @@ class InputHandler {
 	ButtonPad _buttonPad;
 
 	// Pointers to relevant other classes
-	PSPKeyboard *_keyboard;
 	Cursor *_cursor;
 	ImageViewer *_imageViewer;
 

backends/platform/psp/module.mk

@@ -11,7 +11,6 @@ MODULE_OBJS := powerman.o \
 	input.o \
 	cursor.o \
 	trace.o \
-	pspkeyboard.o \
 	audio.o \
 	thread.o \
 	rtc.o \

backends/platform/psp/osys_psp.cpp

@@ -64,7 +64,9 @@ void OSystem_PSP::initBackend() {
 	ConfMan.registerDefault("kbdmouse_speed", 3);
 	ConfMan.registerDefault("joystick_deadzone", 3);
 	ConfMan.registerDefault("gm_device", "null");
-
+	ConfMan.registerDefault("vkeybd_pack_name", "vkeybd_small");
+	ConfMan.set("vkeybd_pack_name", "vkeybd_small");
+
 	// Instantiate real time clock
 	PspRtc::instance();
 
@@ -75,13 +77,11 @@ void OSystem_PSP::initBackend() {
 	_displayManager.setCursor(&_cursor);
 	_displayManager.setScreen(&_screen);
 	_displayManager.setOverlay(&_overlay);
-	_displayManager.setKeyboard(&_keyboard);
 	_displayManager.setImageViewer(&_imageViewer);
 	_displayManager.init();
 
 	// Set pointers for input handler
 	_inputHandler.setCursor(&_cursor);
-	_inputHandler.setKeyboard(&_keyboard);
 	_inputHandler.setImageViewer(&_imageViewer);
 	_inputHandler.init();
 
@@ -93,9 +93,6 @@ void OSystem_PSP::initBackend() {
 
 	_timerManager = new PspTimerManager();
 
-	PSP_DEBUG_PRINT("calling keyboard.load()\n");
-	_keyboard.load();	// Load virtual keyboard files into memory
-
 	setupMixer();
 
 	EventsBaseBackend::initBackend();

backends/platform/psp/osys_psp.h

@@ -32,7 +32,6 @@
 #include "backends/platform/psp/display_client.h"
 #include "backends/platform/psp/default_display_client.h"
 #include "backends/platform/psp/cursor.h"
-#include "backends/platform/psp/pspkeyboard.h"
 #include "backends/platform/psp/image_viewer.h"
 #include "backends/platform/psp/display_manager.h"
 #include "backends/platform/psp/input.h"
@@ -51,7 +50,6 @@ class OSystem_PSP : public EventsBaseBackend, public PaletteManager {
 	Overlay _overlay;
 	Cursor _cursor;
 	DisplayManager _displayManager;
-	PSPKeyboard _keyboard;
 	InputHandler _inputHandler;
 	PspAudio _audio;
 	ImageViewer _imageViewer;