Re-wrote large parts of the server client architecture. No more fifo.

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index b73d8015bd65cdb3abb2ef6ea6ec47670110a18a..745b2abe3a3e557ac9277f5f31caf9ab7db4cf25 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -4,11 +4,11 @@
 #include <stdint.h> /* uint8_t, uint16_t */
 #include <stdio.h> /* sprintf() */
 #include <string.h> /* strlen() */
-#include "io.h" /* try_send() */
+#include "io.h" /* send() */
 #include "keybindings.h" /* get_command_to_keycode(), get_keycode_to_command(),
                           * mod_selected_keyb(), move_keyb_selection()
                           */
-#include "map_window.h" /* for map_scroll(), map_center() */
+#include "map.h" /* for map_scroll(), map_center() */
 #include "misc.h" /* reload_interface_conf(), save_interface_conf(),
                    * nav_inventory()
                    */
@@ -81,10 +81,10 @@ static uint8_t try_2args(struct Command * command, char * match,
 static uint8_t try_client_commands(struct Command * command)
 {
     return (   try_0args(command, "map_c", map_center)
-            || try_1args(command, "map_u", map_scroll, 'N')
-            || try_1args(command, "map_d", map_scroll, 'S')
-            || try_1args(command, "map_r", map_scroll, 'E')
-            || try_1args(command, "map_l", map_scroll, 'W')
+            || try_1args(command, "map_u", map_scroll, '8')
+            || try_1args(command, "map_d", map_scroll, '2')
+            || try_1args(command, "map_r", map_scroll, '6')
+            || try_1args(command, "map_l", map_scroll, '4')
             || try_1args(command, "inv_u", nav_inventory, 'u')
             || try_1args(command, "inv_d", nav_inventory, 'd')
             || try_1args(command, "cyc_win_f", cycle_active_win, 'f')
@@ -139,7 +139,7 @@ static uint8_t try_server_commands(struct Command * command)
         uint8_t arg_size = 3;
         char msg[command_size + 1 + arg_size + 1];
         sprintf(msg, "%s %d", command->server_msg, arg);
-        try_send(msg);
+        send(msg);
         return 1;
     }
     return 0;
@@ -149,21 +149,21 @@ static uint8_t try_server_commands(struct Command * command)
 
 extern uint8_t try_key(uint16_t key)
 {
-    struct Command * command = get_command_to_keycode(world.kb_global.kbs, key);
+    struct Command * command = get_command_to_keycode(&world.kb_global, key);
     if (!command && world.winDB.active)
     {
         struct Win * w = get_win_by_id(world.winDB.active);
         if      (0 == w->view)
         {
-            command = get_command_to_keycode(w->kb.kbs, key);
+            command = get_command_to_keycode(&w->kb, key);
         }
         else if (1 == w->view)
         {
-            command = get_command_to_keycode(world.kb_wingeom.kbs, key);
+            command = get_command_to_keycode(&world.kb_wingeom, key);
         }
         else if (2 == w->view)
         {
-            command = get_command_to_keycode(world.kb_winkeys.kbs, key);
+            command = get_command_to_keycode(&world.kb_winkeys, key);
         }
     }
     if (command)