X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=ad94ea10c11c0e02d51de6ad188964704e9e777d;hb=f9d5829b125ef2df8d63bc08761be33f93c65691;hp=dff79ab34fe7ebf7430d6f519e9ffe6cf4a18df3;hpb=e03020342a74aef143b1ec38c18966dac64181b5;p=plomrogue

diff --git a/src/client/control.c b/src/client/control.c
index dff79ab..ad94ea1 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -4,7 +4,7 @@
 #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()
                           */
@@ -12,10 +12,12 @@
 #include "misc.h" /* reload_interface_conf(), save_interface_conf(),
                    * nav_inventory()
                    */
-#include "windows.h" /* get_win_byid(), shift_active_win(), resize_active_win(),
-                      * toggle_win_size_type(), toggle_window(),
-                      * cycle_active_win(), scroll_v_screen()
-                      */
+#include "wincontrol.h" /* shift_active_win(), resize_active_win(),
+                         * toggle_win_size_type(), toggle_window(),
+                         * cycle_active_win(), scroll_v_screen(),
+                         * toggle_linebreak_type(), toggle_winconfig()
+                         */
+#include "windows.h" /* get_win_by_id() */
 #include "world.h" /* for global world */
 
 
@@ -104,6 +106,7 @@ static uint8_t try_client_commands(struct Command * command)
             || try_1args(command, "shri_h", resize_active_win, '_')
             || try_1args(command, "grow_v", resize_active_win, '+')
             || try_1args(command, "shri_v", resize_active_win, '-')
+            || try_0args(command, "to_break", toggle_linebreak_type)
             || try_1args(command, "to_height_t", toggle_win_size_type, 'y')
             || try_1args(command, "to_width_t", toggle_win_size_type, 'x')
             || try_1args(command, "shift_f", shift_active_win, 'f')
@@ -139,7 +142,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,30 +152,30 @@ 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)
     {
-        if (try_server_commands(command))
+        if      (try_server_commands(command))
         {
             return 1;
         }
-        else if      (try_client_commands(command))
+        else if (try_client_commands(command))
         {
             return 1;
         }