added full keyboard support for LG WebOS

Sputkin · Mar 24, 2018 · 76bf6ca · 76bf6ca
1 parent 4e56290
commit 76bf6ca
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/uNext/CFG.cpp b/uNext/CFG.cpp
@@ -59,27 +59,27 @@ std::string CCFG::getKeyString(int keyID) {
 	}
 
 	switch(keyID) {
-		case SDLK_ESCAPE:
+		case SDL_SCANCODE_ESCAPE:
 			return "ESCAPE";
-		case SDLK_SPACE:
+		case SDL_SCANCODE_SPACE:
 			return "SPACE";
-		case SDLK_LSHIFT:
+		case SDL_SCANCODE_LSHIFT:
 			return "LSHIFT";
-		case SDLK_RSHIFT:
+		case SDL_SCANCODE_RSHIFT:
 			return "RSHIFT";
-		case SDLK_UP:
+		case SDL_SCANCODE_UP:
 			return "UP";
-		case SDLK_DOWN:
+		case SDL_SCANCODE_DOWN:
 			return "DOWN";
-		case SDLK_RIGHT:
+		case SDL_SCANCODE_RIGHT:
 			return "RIGHT";
-		case SDLK_LEFT:
+		case SDL_SCANCODE_LEFT:
 			return "LEFT";
-		case SDLK_LCTRL:
+		case SDL_SCANCODE_LCTRL:
 			return "LCTRL";
-		case SDLK_RCTRL:
+		case SDL_SCANCODE_RCTRL:
 			return "RCTRL";
 	}
 
 	return "NONE";
-}
+}
diff --git a/uNext/Core.cpp b/uNext/Core.cpp
@@ -65,11 +65,11 @@ CCore::CCore(void) {
 
 	this->mouseX = this->mouseY = 0;
 
-	CCFG::keyIDA = SDLK_a;
-	CCFG::keyIDS = SDLK_s;
-	CCFG::keyIDD = SDLK_d;
-	CCFG::keyIDSpace = SDLK_SPACE;
-	CCFG::keyIDShift = SDLK_LSHIFT;
+	CCFG::keyIDA = SDL_SCANCODE_A;
+	CCFG::keyIDS = SDL_SCANCODE_S;
+	CCFG::keyIDD = SDL_SCANCODE_D;
+	CCFG::keyIDSpace = SDL_SCANCODE_SPACE;
+	CCFG::keyIDShift = SDL_SCANCODE_LSHIFT;
 }
 
 CCore::~CCore(void) {
@@ -135,37 +135,37 @@ void CCore::InputMenu() {
 		CCFG::getMM()->setKey(mainEvent->key.keysym.sym);
 
 		switch(mainEvent->key.keysym.sym) {
-			case SDLK_s: case SDLK_DOWN:
+			case SDL_SCANCODE_S: case SDL_SCANCODE_DOWN:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->keyPressed(2);
 					keyMenuPressed = true;
 				}
 				break;
-			case SDLK_w: case SDLK_UP:
+			case SDL_SCANCODE_W: case SDL_SCANCODE_UP:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->keyPressed(0);
 					keyMenuPressed = true;
 				}
 				break;
-			case SDLK_KP_ENTER: case SDLK_RETURN:
+			case SDL_SCANCODE_KP_ENTER: case SDL_SCANCODE_RETURN:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->enter();
 					keyMenuPressed = true;
 				}
 				break;
-			case SDLK_ESCAPE:
+			case SDL_SCANCODE_ESCAPE:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->escape();
 					keyMenuPressed = true;
 				}
 				break;
-			case SDLK_LEFT: case SDLK_d:
+			case SDL_SCANCODE_LEFT: case SDL_SCANCODE_D:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->keyPressed(3);
 					keyMenuPressed = true;
 				}
 				break;
-			case SDLK_RIGHT: case SDLK_a:
+			case SDL_SCANCODE_RIGHT: case SDL_SCANCODE_A:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->keyPressed(1);
 					keyMenuPressed = true;
@@ -176,7 +176,7 @@ void CCore::InputMenu() {
 
 	if(mainEvent->type == SDL_KEYUP) {
 		switch(mainEvent->key.keysym.sym) {
-			case SDLK_s: case SDLK_DOWN: case SDLK_w: case SDLK_UP: case SDLK_KP_ENTER: case SDLK_RETURN: case SDLK_ESCAPE: case SDLK_a: case SDLK_RIGHT: case SDLK_LEFT: case SDLK_d:
+			case SDL_SCANCODE_S: case SDL_SCANCODE_DOWN: case SDL_SCANCODE_W: case SDL_SCANCODE_UP: case SDL_SCANCODE_KP_ENTER: case SDL_SCANCODE_RETURN: case SDL_SCANCODE_ESCAPE: case SDL_SCANCODE_A: case SDL_SCANCODE_RIGHT: case SDL_SCANCODE_LEFT: case SDL_SCANCODE_D:
 				keyMenuPressed = false;
 				break;
 			default:
@@ -230,7 +230,7 @@ void CCore::InputPlayer() {
 				}
 			}
 		switch(mainEvent->key.keysym.sym) {
-			case SDLK_KP_ENTER: case SDLK_RETURN: case SDLK_ESCAPE:
+			case SDL_SCANCODE_KP_ENTER: case SDL_SCANCODE_RETURN: case SDL_SCANCODE_ESCAPE:
 				keyMenuPressed = false;
 				break;
 		}
@@ -273,12 +273,12 @@ void CCore::InputPlayer() {
 		}
 
 		switch(mainEvent->key.keysym.sym) {
-			case SDLK_KP_ENTER: case SDLK_RETURN:
+			case SDL_SCANCODE_KP_ENTER: case SDL_SCANCODE_RETURN:
 				if(!keyMenuPressed) {
 					CCFG::getMM()->enter();
 					keyMenuPressed = true;
 				}
-			case SDLK_ESCAPE:
+			case SDL_SCANCODE_ESCAPE:
 				if(!keyMenuPressed && CCFG::getMM()->getViewID() == CCFG::getMM()->eGame) {
 					CCFG::getMM()->resetActiveOptionID(CCFG::getMM()->ePasue);
 					CCFG::getMM()->setViewID(CCFG::getMM()->ePasue);

diff --git a/uNext/OptionsMenu.cpp b/uNext/OptionsMenu.cpp
@@ -155,7 +155,7 @@ void OptionsMenu::escape() {
 }
 
 void OptionsMenu::setKey(int keyID) {
-	if(inSetKey && keyID != SDLK_KP_ENTER && keyID != SDLK_RETURN && keyID != SDLK_ESCAPE) {
+	if(inSetKey && keyID != SDL_SCANCODE_KP_ENTER && keyID != SDL_SCANCODE_RETURN && keyID != SDL_SCANCODE_ESCAPE) {
 		switch(activeMenuOption) {
 			case 1:
 				CCFG::keyIDA = keyID;
@@ -194,7 +194,7 @@ void OptionsMenu::setKey(int keyID) {
 				break;
 		}
 		resetSetKey = true;
-	} else if(keyID == SDLK_ESCAPE) {
+	} else if(keyID == SDL_SCANCODE_ESCAPE) {
 		resetSetKey = true;
 	}
 }
@@ -233,4 +233,4 @@ void OptionsMenu::updateVolumeRect() {
 
 void OptionsMenu::setEscapeToMainMenu(bool escapeToMainMenu) {
 	this->escapeToMainMenu = escapeToMainMenu;
-}
+}