X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fcontrol.c;h=287c099c875d89f2be010012726aed34c1d687b5;hb=4b5302fe73b9aa08819ff740bbf8286352a990fb;hp=9915891bd756337b7c954ca3c3282b004d7fb451;hpb=58f0067336c9239750009b3f35d18031bec8f7b5;p=plomrogue

diff --git a/src/control.c b/src/control.c
index 9915891..287c099 100644
--- a/src/control.c
+++ b/src/control.c
@@ -5,182 +5,318 @@
 #include "windows.h" /* for cycle_active_win(), shift_active_win(), struct Win,
                       *  struct WinMeta
                       */
-#include "keybindings.h" /* for get_action_key(), save_keybindings(),
-                          * keyswin_move_selection(), keyswin_mod_key()
+#include "keybindings.h" /* for get_keycode_to_action(), mod_selected_keyb(),
+                          * move_keyb_mod_selection()
                           */
-#include "map.h" /* for map_scroll(), map_center_player(), dir enum */
-#include "main.h" /* for World struct */
+#include "map.h" /* for map_scroll() */
+#include "main.h" /* for world global */
 #include "rexit.h" /* for exit_err() */
-#include "misc.h" /* for scroll_pad(), toggle_window(),
-                   * growshrink_active_window()
+#include "wincontrol.h" /* for scroll_pad(), toggle_window(),
+                         * growshrink_active_window(), toggle_winconfig(),
+                         * toggle_win_height_type(), toggle_win_width_type()
+                         */
+#include "map_object_actions.h" /* for player_wait(), move_player(),
+                                 * player_drop(), player_pick()
+                                 */
+#include "command_db.h" /* for is_command_id_shortdsc() */
+#include "misc.h" /* for load_interface_conf(), unload_interface_conf(),
+                   * save_interface_conf(), nav_inventory()
                    */
-#include "map_object_actions.h" /* for player_wait(), move_player() */
+#include "yx_uint16.h" /* for dir enum */
+#include "map_objects.h" /* for get_player() */
 
 
 
-extern void record_control(int action, struct World * world)
+extern uint16_t get_available_keycode_to_action(char * name)
 {
-    if (0 == action)
+    uint16_t keycode = get_keycode_to_action(world.kb_global.kbs, name);
+    if (0 != keycode || 0 == world.wmeta->active)
     {
-        player_wait(world);
+        return keycode;
     }
-    else if (NORTH == action)
+    struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
+    if (0 == wc->view)
     {
-        move_player(world, NORTH);
+        keycode = get_keycode_to_action(wc->kb.kbs, name);
     }
-    else if (EAST  == action)
+    else if (1 == wc->view)
     {
-        move_player(world, EAST);
+        keycode = get_keycode_to_action(world.kb_wingeom.kbs, name);
     }
-    else if (SOUTH == action)
+    else if (2 == wc->view)
     {
-        move_player(world, SOUTH);
-    }
-    else if (WEST == action)
-    {
-        move_player(world, WEST);
+        keycode = get_keycode_to_action(world.kb_winkeys.kbs, name);
     }
+    return keycode;
 }
 
 
 
-extern uint8_t player_control(int key, struct World * world)
+extern uint8_t player_control_by_id(int action)
 {
-    if      (key == get_action_key(world->keybindings, "player_u"))
+    if      (is_command_id_shortdsc(action, "wait"))
+    {
+        player_wait();
+    }
+    else if (is_command_id_shortdsc(action, "player_u"))
+    {
+        move_player(NORTH);
+    }
+    else if (is_command_id_shortdsc(action, "player_r"))
     {
-        move_player(world, NORTH);
+        move_player(EAST);
     }
-    else if (key == get_action_key(world->keybindings, "player_r"))
+    else if (is_command_id_shortdsc(action, "player_d"))
     {
-        move_player(world, EAST);
+        move_player(SOUTH);
     }
-    else if (key == get_action_key(world->keybindings, "player_d"))
+    else if (is_command_id_shortdsc(action, "player_l"))
     {
-        move_player(world, SOUTH);
+        move_player(WEST);
     }
-    else if (key == get_action_key(world->keybindings, "player_l"))
+    else if (is_command_id_shortdsc(action, "drop"))
     {
-        move_player(world, WEST);
+        player_drop();
     }
-    else if (key == get_action_key(world->keybindings, "wait"))
+    else if (is_command_id_shortdsc(action, "pick"))
     {
-        player_wait(world);
+        player_pick();
     }
     else
     {
-        return 1;
+        return 0;
+    }
+    return 1;
+}
+
+
+
+extern uint8_t player_control_by_key(int key)
+{
+    char * action_name = get_func_to_keycode(world.kb_global.kbs, key);
+    if (NULL == action_name && 0 != world.wmeta->active)
+    {
+        struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
+        action_name = get_func_to_keycode(wc->kb.kbs, key);
+    }
+    if (NULL != action_name)
+    {
+        uint8_t action_id = get_command_id(action_name);
+        return player_control_by_id(action_id);
     }
     return 0;
 }
 
 
 
-extern uint8_t meta_control(int key, struct World * world)
+extern uint8_t wingeom_control(int key)
 {
-    struct WinMeta * win_meta = world->wins.meta;
-    struct Win * win_keys     = world->wins.keys;
-    struct Win * win_map      = world->wins.map;
-    struct Win * win_info     = world->wins.info;
-    struct Win * win_log      = world->wins.log;
-    char * err_toggle = "Trouble with toggle_window() in meta_keys().";
-    char * err_shift  = "Trouble with shift_active_win() in meta_keys().";
+    char * err_shift  = "Trouble with shift_active_win() in wingeom_control().";
     char * err_resize = "Trouble with growshrink_active_window() in "
-                        "meta_keys().";
-    if (key == get_action_key(world->keybindings, "quit"))
+                        "wingeom_control().";
+    if      (key == get_available_keycode_to_action("to_height_t"))
+    {
+        toggle_win_height_type(world.wmeta->active);
+    }
+    else if (key == get_available_keycode_to_action("to_width_t"))
+    {
+        toggle_win_width_type(world.wmeta->active);
+    }
+    else if (key == get_available_keycode_to_action("grow_h"))
+    {
+        exit_err(growshrink_active_window('*'), err_resize);
+    }
+    else if (key == get_available_keycode_to_action("shri_h"))
+    {
+        exit_err(growshrink_active_window('_'), err_resize);
+    }
+    else if (key == get_available_keycode_to_action("grow_v"))
+    {
+        exit_err(growshrink_active_window('+'), err_resize);
+    }
+    else if (key == get_available_keycode_to_action("shri_v"))
+    {
+        exit_err(growshrink_active_window('-'), err_resize);
+    }
+    else if (key == get_available_keycode_to_action("shift_f"))
+    {
+        exit_err(shift_active_win(world.wmeta, 'f'), err_shift);
+    }
+    else if (key == get_available_keycode_to_action("shift_b"))
+    {
+        exit_err(shift_active_win(world.wmeta, 'b'), err_shift);
+    }
+    else
+    {
+        return 0;
+    }
+    return 1;
+}
+
+
+
+extern uint8_t winkeyb_control(int key)
+{
+    struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
+    if      (key == get_available_keycode_to_action("w_keys_u"))
+    {
+        move_keyb_mod_selection(&wc->kb, 'u');
+    }
+    else if (key == get_available_keycode_to_action("w_keys_d"))
+    {
+        move_keyb_mod_selection(&wc->kb, 'd');
+    }
+    else if (key == get_available_keycode_to_action("w_keys_m"))
+    {
+        mod_selected_keyb(&wc->kb);
+    }
+    else
+    {
+        return 0;
+    }
+    return 1;
+}
+
+
+
+extern uint8_t meta_control(int key)
+{
+    struct WinMeta * win_meta = world.wmeta;
+    struct Win * win_map      = get_win_by_id('m');
+    char * err_toggle = "Trouble with toggle_window() in meta_control().";
+    if      (key == get_available_keycode_to_action("quit"))
     {
         return 1;
     }
-    else if (key == get_action_key(world->keybindings, "scrl_r"))
+    else if (key == get_available_keycode_to_action("winconf"))
+    {
+        toggle_winconfig(world.wmeta->active);
+    }
+    else if (key == get_available_keycode_to_action("cyc_win_f"))
+    {
+        cycle_active_win(world.wmeta, 'f');
+    }
+    else if (key == get_available_keycode_to_action("cyc_win_b"))
+    {
+        cycle_active_win(world.wmeta, 'b');
+    }
+    else if (key == get_available_keycode_to_action("scrl_r"))
     {
         scroll_pad(win_meta, '+');
     }
-    else if (key == get_action_key(world->keybindings, "scrl_l"))
+    else if (key == get_available_keycode_to_action("scrl_l"))
     {
         scroll_pad(win_meta, '-');
     }
-    else if (key == get_action_key(world->keybindings, "to_keywin"))
+    else if (key == get_available_keycode_to_action("to_a_keywin"))
+    {
+       exit_err(toggle_window(win_meta, get_win_by_id('k')), err_toggle);
+    }
+    else if (key == get_available_keycode_to_action("to_g_keywin"))
+    {
+        exit_err(toggle_window(win_meta, get_win_by_id('0')), err_toggle);
+    }
+    else if (key == get_available_keycode_to_action("to_wg_keywin"))
     {
-        exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
+        exit_err(toggle_window(win_meta, get_win_by_id('1')), err_toggle);
     }
-    else if (key == get_action_key(world->keybindings, "to_mapwin"))
+    else if (key == get_available_keycode_to_action("to_wk_keywin"))
     {
-        exit_err(toggle_window(win_meta, win_map), world, err_toggle);
+        exit_err(toggle_window(win_meta, get_win_by_id('2')), err_toggle);
     }
-    else if (key == get_action_key(world->keybindings, "to_infowin"))
+    else if (key == get_available_keycode_to_action("to_mapwin"))
     {
-        exit_err(toggle_window(win_meta, win_info), world, err_toggle);
+        exit_err(toggle_window(win_meta, win_map), err_toggle);
     }
-    else if (key == get_action_key(world->keybindings, "to_logwin"))
+    else if (key == get_available_keycode_to_action("to_infowin"))
     {
-        exit_err(toggle_window(win_meta, win_log), world, err_toggle);
+        exit_err(toggle_window(win_meta, get_win_by_id('i')), err_toggle);
     }
-    else if (key == get_action_key(world->keybindings, "cyc_win_f"))
+    else if (key == get_available_keycode_to_action("to_inv"))
     {
-        cycle_active_win(win_meta, 'f');
+        exit_err(toggle_window(win_meta, get_win_by_id('c')), err_toggle);
     }
-    else if (key == get_action_key(world->keybindings, "cyc_win_b"))
+    else if (key == get_available_keycode_to_action("to_logwin"))
     {
-        cycle_active_win(win_meta, 'b');
+        exit_err(toggle_window(win_meta, get_win_by_id('l')), err_toggle);
     }
-    else if (key == get_action_key(world->keybindings, "shift_f"))
+    else if (key == get_available_keycode_to_action("save_conf"))
     {
-        exit_err(shift_active_win(win_meta, 'f'), world, err_shift);
+        save_interface_conf();
     }
-    else if (key == get_action_key(world->keybindings, "shift_b"))
+    else if (key == get_available_keycode_to_action("g_keys_u"))
     {
-        exit_err(shift_active_win(win_meta, 'b'), world, err_shift);
+        move_keyb_mod_selection(&world.kb_global, 'u');
     }
-    else if (key == get_action_key(world->keybindings, "grow_h"))
+    else if (key == get_available_keycode_to_action("g_keys_d"))
     {
-        exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
+        move_keyb_mod_selection(&world.kb_global, 'd');
     }
-    else if (key == get_action_key(world->keybindings, "shri_h"))
+    else if (key == get_available_keycode_to_action("g_keys_m"))
     {
-        exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
+        mod_selected_keyb(&world.kb_global);
     }
-    else if (key == get_action_key(world->keybindings, "grow_v"))
+    else if (key == get_available_keycode_to_action("wg_keys_u"))
     {
-        exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
+        move_keyb_mod_selection(&world.kb_wingeom, 'u');
     }
-    else if (key == get_action_key(world->keybindings, "shri_v"))
+    else if (key == get_available_keycode_to_action("wg_keys_d"))
     {
-        exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
+        move_keyb_mod_selection(&world.kb_wingeom, 'd');
     }
-    else if (key == get_action_key(world->keybindings, "save_keys"))
+    else if (key == get_available_keycode_to_action("wg_keys_m"))
     {
-        save_keybindings(world);
+        mod_selected_keyb(&world.kb_wingeom);
     }
-    else if (key == get_action_key(world->keybindings, "keys_u"))
+    else if (key == get_available_keycode_to_action("wk_keys_u"))
     {
-        keyswin_move_selection(world, 'u');
+        move_keyb_mod_selection(&world.kb_winkeys, 'u');
     }
-    else if (key == get_action_key(world->keybindings, "keys_d"))
+    else if (key == get_available_keycode_to_action("wk_keys_d"))
     {
-        keyswin_move_selection(world, 'd');
+        move_keyb_mod_selection(&world.kb_winkeys, 'd');
     }
-    else if (key == get_action_key(world->keybindings, "keys_m"))
+    else if (key == get_available_keycode_to_action("wk_keys_m"))
     {
-        keyswin_mod_key(world, win_meta);
+        mod_selected_keyb(&world.kb_winkeys);
     }
-    else if (key == get_action_key(world->keybindings, "map_u"))
+    else if (key == get_available_keycode_to_action("map_u"))
     {
-        map_scroll(world->map, NORTH, win_map->frame.size);
-     }
-    else if (key == get_action_key(world->keybindings, "map_d"))
+        map_scroll(win_map, world.map->size, NORTH);
+    }
+    else if (key == get_available_keycode_to_action("map_d"))
+    {
+        map_scroll(win_map, world.map->size, SOUTH);
+    }
+    else if (key == get_available_keycode_to_action("map_r"))
+    {
+        map_scroll(win_map, world.map->size, EAST);
+    }
+    else if (key == get_available_keycode_to_action("map_l"))
+    {
+        map_scroll(win_map, world.map->size, WEST);
+    }
+    else if (key == get_available_keycode_to_action("map_c"))
+    {
+        struct MapObj * player = get_player();
+        win_map->center = player->pos;
+    }
+    else if (key == get_available_keycode_to_action("inv_u"))
     {
-        map_scroll(world->map, SOUTH, win_map->frame.size);
+        nav_inventory('u');
     }
-    else if (key == get_action_key(world->keybindings, "map_r"))
+    else if (key == get_available_keycode_to_action("inv_d"))
     {
-        map_scroll(world->map, EAST, win_map->frame.size);
+        nav_inventory('d');
     }
-    else if (key == get_action_key(world->keybindings, "map_l"))
+    else if (key == get_available_keycode_to_action("reload_conf"))
     {
-        map_scroll(world->map, WEST, win_map->frame.size);
+        unload_interface_conf();
+        load_interface_conf();
     }
-    else if (key == get_action_key(world->keybindings, "map_c"))
+    else if (key == get_available_keycode_to_action("winconf"))
     {
-        map_center_player (world->map, world->player, win_map->frame.size);
+        toggle_winconfig(world.wmeta->active);
     }
     return 0;
 }