remove unused functions and merge keypress with input

CataclysmWin.cbp

@@ -291,8 +291,6 @@
 		<Unit filename="src/iuse_software_sokoban.h" />
 		<Unit filename="src/json.cpp" />
 		<Unit filename="src/json.h" />
-		<Unit filename="src/keypress.cpp" />
-		<Unit filename="src/keypress.h" />
 		<Unit filename="src/lightmap.cpp" />
 		<Unit filename="src/lightmap.h" />
 		<Unit filename="src/line.cpp" />

msvc110/Cataclysm.vcxproj

@@ -139,7 +139,6 @@
     <ClCompile Include="..\src\iuse_software_snake.cpp" />
     <ClCompile Include="..\src\iuse_software_sokoban.cpp" />
     <ClCompile Include="..\src\json.cpp" />
-    <ClCompile Include="..\src\keypress.cpp" />
     <ClCompile Include="..\src\lightmap.cpp" />
     <ClCompile Include="..\src\line.cpp" />
     <ClCompile Include="..\src\live_view.cpp" />
@@ -272,7 +271,6 @@
     <ClInclude Include="..\src\iuse_software_snake.h" />
     <ClInclude Include="..\src\iuse_software_sokoban.h" />
     <ClInclude Include="..\src\json.h" />
-    <ClInclude Include="..\src\keypress.h" />
     <ClInclude Include="..\src\lightmap.h" />
     <ClInclude Include="..\src\line.h" />
     <ClInclude Include="..\src\live_view.h" />

msvc110/Cataclysm.vcxproj.filters

@@ -162,9 +162,6 @@
     <ClCompile Include="..\src\json.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\keypress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\lightmap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -557,9 +554,6 @@
     <ClInclude Include="..\src\json.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\keypress.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\lightmap.h">
       <Filter>Header Files</Filter>
     </ClInclude>

src/action.cpp

@@ -1,5 +1,4 @@
 #include "action.h"
-#include "keypress.h"
 #include "output.h"
 #include <istream>
 #include <sstream>

src/advanced_inv.cpp

@@ -1,5 +1,4 @@
 #include "game.h"
-#include "keypress.h"
 #include "output.h"
 #include "map.h"
 #include <map>

src/auto_pickup.cpp

@@ -2,7 +2,6 @@
 #include "auto_pickup.h"
 #include "output.h"
 #include "debug.h"
-#include "keypress.h"
 #include "item_factory.h"
 #include "catacharset.h"
 #include "translations.h"

src/bionics.cpp

@@ -2,7 +2,6 @@
 #include "game.h"
 #include "rng.h"
 #include "input.h"
-#include "keypress.h"
 #include "item.h"
 #include "bionics.h"
 #include "line.h"

src/construction.cpp

@@ -2,7 +2,6 @@
 
 #include "game.h"
 #include "output.h"
-#include "keypress.h"
 #include "player.h"
 #include "inventory.h"
 #include "mapdata.h"

src/defense.cpp

@@ -1,7 +1,6 @@
 #include "gamemode.h"
 #include "game.h"
 #include "setvector.h"
-#include "keypress.h"
 #include "itype.h"
 #include "mtype.h"
 #include "overmapbuffer.h"

src/editmap.cpp

@@ -1,6 +1,5 @@
 #include "game.h"
 #include "input.h"
-#include "keypress.h"
 #include "output.h"
 #include "line.h"
 #include "computer.h"

src/game.cpp

@@ -1,7 +1,6 @@
 #include "game.h"
 #include "rng.h"
 #include "input.h"
-#include "keypress.h"
 #include "output.h"
 #include "skill.h"
 #include "line.h"

src/help.cpp

@@ -3,7 +3,7 @@
 #include "action.h"
 #include "auto_pickup.h"
 #include "catacharset.h"
-#include "keypress.h"
+#include "input.h"
 #include "options.h"
 #include "output.h"
 #include "rng.h"

src/iexamine.cpp

@@ -1,15 +1,7 @@
-//
-//  iexamine.cpp
-//  Cataclysm
-//
-//  Livingstone
-//
-
 #include "item_factory.h"
 #include "iuse.h"
 #include "game.h"
 #include "mapdata.h"
-#include "keypress.h"
 #include "output.h"
 #include "rng.h"
 #include "line.h"

src/input.cpp

@@ -3,13 +3,58 @@
 #include "input.h"
 #include "json.h"
 #include "output.h"
-#include "keypress.h"
 #include "game.h"
 #include <fstream>
+#include <errno.h>
 
 /* TODO Replace the hardcoded values with an abstraction layer.
  * Lower redundancy across the methods. */
 
+long input(long ch)
+{
+    if (ch == -1) {
+        ch = get_keypress();
+    }
+
+    switch (ch)
+    {
+        case KEY_UP:    return 'k';
+        case KEY_LEFT:  return 'h';
+        case KEY_RIGHT: return 'l';
+        case KEY_DOWN:  return 'j';
+        case KEY_NPAGE: return '>';
+        case KEY_PPAGE: return '<';
+        case 459:       return '\n';
+        default:        return ch;
+    }
+}
+
+long get_keypress()
+{
+    long ch = getch();
+
+    // Our current tiles and Windows code doesn't have ungetch()
+#if !(defined TILES || defined SDLTILES || defined _WIN32 || defined WINDOWS)
+    if (ch != ERR) {
+        int newch;
+
+        // Clear the buffer of characters that match the one we're going to act on.
+        timeout(0);
+        do {
+            newch = getch();
+        } while( newch != ERR && newch == ch );
+        timeout(-1);
+
+        // If we read a different character than the one we're going to act on, re-queue it.
+        if (newch != ERR && newch != ch) {
+            ungetch(newch);
+        }
+    }
+#endif
+
+    return ch;
+}
+
 InputEvent get_input(int ch)
 {
     if (ch == '\0') {

src/input.h

@@ -11,6 +11,8 @@
     #define GAMEPAD_ENABLED
 #endif
 
+#define KEY_ESCAPE 27
+
 enum InputEvent {
     Confirm,
     Cancel,
@@ -42,6 +44,10 @@ bool is_mouse_enabled();
 void get_direction(int &x, int &y, InputEvent &input);
 std::string get_input_string_from_file(std::string fname="input.txt");
 
+// Simple text input--translates numpad to vikeys
+long input(long ch = -1);
+long get_keypress();
+
 enum mouse_buttons { MOUSE_BUTTON_LEFT=1, MOUSE_BUTTON_RIGHT, SCROLLWHEEL_UP, SCROLLWHEEL_DOWN, MOUSE_MOVE };
 
 enum input_event_t {
@@ -122,8 +128,6 @@ struct input_event {
 
 // Definitions for joystick/gamepad.
 
-
-
 // On the joystick there's a maximum of 256 key states.
 // So for joy axis events, we simply use a number larger
 // than that.

src/inventory.cpp

@@ -1,7 +1,6 @@
 #include <sstream>
 #include "inventory.h"
 #include "game.h"
-#include "keypress.h"
 #include "mapdata.h"
 #include "item_factory.h"
 

src/inventory_ui.cpp

@@ -1,7 +1,6 @@
 #include "game.h"
 #include "output.h"
 #include "uistate.h"
-#include "keypress.h"
 #include "translations.h"
 #include "item_factory.h"
 #include "options.h"

src/iuse.cpp

@@ -1,7 +1,6 @@
 #include "iuse.h"
 #include "game.h"
 #include "mapdata.h"
-#include "keypress.h"
 #include "output.h"
 #include "options.h"
 #include "rng.h"

src/iuse_software.h

@@ -2,7 +2,6 @@
 #define _IUSE_SOFTWARE_H_
 
 #include <string>
-#include "keypress.h"
 #include "game.h"
 #include "output.h"
 #include "catacharset.h"

src/main_menu.cpp

@@ -1,5 +1,4 @@
 #include "game.h"
-#include "keypress.h"
 #include "debug.h"
 #include "input.h"
 #include "mapbuffer.h"

src/melee.cpp

@@ -2,7 +2,6 @@
 #include "bionics.h"
 #include "debug.h"
 #include "game.h"
-#include "keypress.h"
 #include "martialarts.h"
 #include <sstream>
 #include <stdlib.h>

src/mod_manager_ui.cpp

@@ -1,6 +1,6 @@
 #include "mod_manager.h"
+#include "input.h"
 #include "output.h"
-#include "keypress.h"
 #include "debug.h"
 #include <algorithm>
 

src/newcharacter.cpp

@@ -4,7 +4,6 @@
 #include "input.h"
 #include "output.h"
 #include "rng.h"
-#include "keypress.h"
 #include "game.h"
 #include "options.h"
 #include "catacharset.h"