Client: Remove unused "active window's keys" window, update README.

diff --git a/README b/README
index 15fc87f41e72cd35db5e9729f67135609ce5f6c5..25c1736c2df75a25c46fb9e3539f1708cc8aec79 100644 (file)
--- a/README
+++ b/README
@@ -46,18 +46,20 @@ the two by hand.
 Client's keybindings and window management
 ------------------------------------------
 
 Client's keybindings and window management
 ------------------------------------------
 

-In the client's default window configuration, the window appearing on the left
-sports a list of keybindings available globally, and additionally via the window
-selected as active.
-
-Hit "W" (per default keybindings) to switch the "active" window to a view that
-allows changing its geometry. One more hit on "W" switches the window to a view
-that allows changing its window-specific keybindings. The global keybindings can
-be changed in the "Global keys" window, those of the window geometry
-configuration in the "Window geometry keys" window, and those of the
-window-specific keybindings configuration in the "Window keybinding keys"
-window; by default, these three windows are not visible, but may be turned on by
-(per default keybindings) hitting the "F6", "F7" and "F8" keys.
+Multiple windows may fill the screen. One of these will be selected as "active"
+– identified by dollar signs enclosing its title. Active windows may come with
+window-specific keybindings. Furthermore, global keybindings are available no
+matter what window is selected.
+
+Hit "W" (per default global keybindings) to switch the active window to a view
+that allows changing its geometry. One more hit on "W" switches the window to a
+view that sports (and allows changing its) window-specific keybindings. (One
+further "W" will return the window to its default, "normal" view.) The global
+keybindings are visible (and can be changed) in the "Set global keys" window,
+those of the window geometry configuration in the "Set window geometry keys"
+window, and those of the window-specific keybindings configuration in the "Set
+window keybinding keys" window; by default, the latter two are not visible, but
+may be turned on by (per default keybindings) hitting the keys "F6" and "F7".

 
 Keybindings and default window selection / visibilities / geometries are read
 from the textfile ./confclient/interface_conf by default, or by another one
 
 Keybindings and default window selection / visibilities / geometries are read
 from the textfile ./confclient/interface_conf by default, or by another one

diff --git a/confclient/interface_conf b/confclient/interface_conf
index 333017e44c8bdc0e907c156f3eafe83aecf80704..ff45f8151df2f5889be66efa73b94a505a953621 100644 (file)
--- a/confclient/interface_conf
+++ b/confclient/interface_conf
@@ -1,4 +1,3 @@
-

 KEYBINDINGS 'global'
 KEY 81 quit
 KEY 87 winconf
 KEYBINDINGS 'global'
 KEY 81 quit
 KEY 87 winconf


@@ -15,7 +14,6 @@ KEY 268 to_logwin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin

-KEY 272 to_a_keywin

 
 KEYBINDINGS 'wingeom'
 KEY 258 shift_f
 
 KEYBINDINGS 'wingeom'
 KEY 258 shift_f


@@ -105,9 +103,3 @@ KEY 260 map_l
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

-
-WINDOW a
-NAME 'Active window`s keys'
-BREAK 0
-WIDTH 22
-HEIGHT -8

diff --git a/confclient/single_wins/info b/confclient/single_wins/info
index bf9c03140cea2d1e94d57b7d4d76391bad0cd7cd..34cabd21c3fce2f262b4eed40e15817d8da470ab 100644 (file)
--- a/confclient/single_wins/info
+++ b/confclient/single_wins/info
@@ -7,7 +7,6 @@ KEY 268 to_logwin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin

-KEY 272 to_a_keywin

 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b
 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b


@@ -117,9 +116,3 @@ KEY 260 map_l
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

-
-WINDOW a
-NAME 'Active window`s keys'
-BREAK 0
-WIDTH 22
-HEIGHT -8

diff --git a/confclient/single_wins/inventory b/confclient/single_wins/inventory
index fbc775e4a6f17dc9a224491951cb75d5071f76d0..763fa72e2530653256cd12a81c69687bb9710819 100644 (file)
--- a/confclient/single_wins/inventory
+++ b/confclient/single_wins/inventory
@@ -7,7 +7,6 @@ KEY 268 to_logwin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin

-KEY 272 to_a_keywin

 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b
 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b


@@ -115,10 +114,3 @@ KEY 260 map_l
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

-
-WINDOW a
-NAME 'Active window`s keys'
-BREAK 0
-WIDTH 22
-HEIGHT -8
-

diff --git a/confclient/single_wins/log b/confclient/single_wins/log
index d064db51e786c3f58b212660678e3b839fbbfb48..42d2fba87b4093d0a5de9cf206deb76d43265c76 100644 (file)
--- a/confclient/single_wins/log
+++ b/confclient/single_wins/log
@@ -7,7 +7,6 @@ KEY 268 to_logwin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin

-KEY 272 to_a_keywin

 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b
 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b


@@ -117,10 +116,3 @@ KEY 260 map_l
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus
 KEY 261 map_r
 KEY 46 map_c
 KEY 70 to_autofocus

-
-WINDOW a
-NAME 'Active window`s keys'
-BREAK 0
-WIDTH 22
-HEIGHT -8
-

diff --git a/confclient/single_wins/map b/confclient/single_wins/map
index 38ed98a1131f51b75efda198d7ede4fff39e519e..689f9c4a14cb56c61e95fd4559a9db8408d2265f 100644 (file)
--- a/confclient/single_wins/map
+++ b/confclient/single_wins/map
@@ -7,7 +7,6 @@ KEY 268 to_logwin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin
 KEY 269 to_g_keywin
 KEY 270 to_wg_keywin
 KEY 271 to_wk_keywin

-KEY 272 to_a_keywin

 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b
 KEY 87 winconf
 KEY 62 cyc_win_f
 KEY 60 cyc_win_b


@@ -106,9 +105,3 @@ NAME 'Log'
 BREAK 0
 WIDTH 13
 HEIGHT -8
 BREAK 0
 WIDTH 13
 HEIGHT -8

-
-WINDOW a
-NAME 'Active window`s keys'
-BREAK 0
-WIDTH 22
-HEIGHT -8

diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c
index b230b6a2bb23330710f306e311b676bca6654030..1a3c9ad16c1c392963fc62401e3253a7fc89c4d1 100644 (file)
--- a/src/client/draw_wins.c
+++ b/src/client/draw_wins.c
@@ -16,7 +16,7 @@
 #include "../common/rexit.h" /* exit_err(), exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */
 #include "../common/rexit.h" /* exit_err(), exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "keybindings.h" /* struct KeyBindingDB, get_keyname_to_keycode() */

-#include "windows.h" /* yx_uint16, Win, get_win_by_id() */
+#include "windows.h" /* yx_uint16, Win */

 #include "world.h" /* global world */
 
 
 #include "world.h" /* global world */
 
 


@@ -56,9 +56,6 @@ static void add_line_compact(struct Win * win, char * line, attr_t attri,
 static void add_text_with_linebreaks(struct Win * win, char * text);
 static void draw_text_from_bottom(struct Win * win, char * text);
 
 static void add_text_with_linebreaks(struct Win * win, char * text);
 static void draw_text_from_bottom(struct Win * win, char * text);
 

-/* Return a properly formatted keybinding list line for "kb". */
-static char * get_kb_line(struct KeyBinding * kb);
-

 /* Draw from line "start" on config view for keybindings defined at "kb". */
 static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
                                    uint16_t offset);
 /* Draw from line "start" on config view for keybindings defined at "kb". */
 static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
                                    uint16_t offset);


@@ -259,19 +256,6 @@ static void draw_text_from_bottom(struct Win * win, char * text)
 
 
 
 
 
 

-static char * get_kb_line(struct KeyBinding * kb)
-{
-    char * keyname = get_keyname_to_keycode(kb->keycode);
-    uint16_t size = strlen(keyname) + 3 + strlen(kb->command->dsc_long) + 1;
-    char * kb_line = try_malloc(size, __func__);
-    int test = sprintf(kb_line, "%s - %s", keyname, kb->command->dsc_long);
-    exit_trouble(test < 0, __func__, "sprintf");
-    free(keyname);
-    return kb_line;
-}
-
-
-

 static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
                                    uint16_t offset)
 {
 static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
                                    uint16_t offset)
 {


@@ -293,7 +277,13 @@ static void draw_keybinding_config(struct Win * win, struct KeyBindingDB * kbdb,
             }
             win->center.y = win->winmap_size.y;
         }
             }
             win->center.y = win->winmap_size.y;
         }

-        char * kb_line = get_kb_line(&kbdb->kbs[kb_n]);
+        struct KeyBinding kb = kbdb->kbs[kb_n];
+        char * keyname = get_keyname_to_keycode(kb.keycode);
+        uint16_t size = strlen(keyname) + 3 + strlen(kb.command->dsc_long) + 1;
+        char * kb_line = try_malloc(size, __func__);
+        int test = sprintf(kb_line, "%s - %s", keyname, kb.command->dsc_long);
+        exit_trouble(test < 0, __func__, "sprintf");
+        free(keyname);

         add_line(win, kb_line, attri, &offset, (kbdb->n_of_kbs == kb_n + 1));
         free(kb_line);
     }
         add_line(win, kb_line, attri, &offset, (kbdb->n_of_kbs == kb_n + 1));
         free(kb_line);
     }


@@ -444,36 +434,6 @@ extern void draw_win_inventory(struct Win * win)
 
 
 
 
 
 

-extern void draw_win_active_windows_keys(struct Win * win)
-{
-    struct Win * win_active = get_win_by_id(world.winDB.active);
-    struct KeyBindingDB * kbdb = &win_active->kb;
-    if      (1 == win_active->view)
-    {
-        kbdb = &world.kb_wingeom;
-    }
-    else if (2 == win_active->view)
-    {
-        kbdb = &world.kb_winkeys;
-    }
-    uint16_t offset = 0;
-    if (0 == kbdb->n_of_kbs)
-    {
-        add_line(win, "(none)", 0, &offset, 0);
-        return;
-    }
-    uint8_t kb_n;
-    for (kb_n = 0; kb_n < kbdb->n_of_kbs; kb_n++)
-    {
-        char * kb_line = get_kb_line(&kbdb->kbs[kb_n]);
-        add_line(win, kb_line, 0, &offset, (0 == kb_n + 1));
-        free(kb_line);
-    }
-
-}
-
-
-

 extern void draw_win_keybindings_global(struct Win * win)
 {
     win->center.y = world.kb_global.select;
 extern void draw_win_keybindings_global(struct Win * win)
 {
     win->center.y = world.kb_global.select;

diff --git a/src/client/main.c b/src/client/main.c
index 4bf6461923bac4c8868de633198b6379f583f68f..d08ac7df59860a202c4d7cac97773c61351f6103 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -33,7 +33,7 @@ int main(int argc, char * argv[])
     /* Declare hard-coded paths and values here. */
     world.path_commands    = "confclient/commands";
     world.path_interface   = "confclient/interface_conf";
     /* Declare hard-coded paths and values here. */
     world.path_commands    = "confclient/commands";
     world.path_interface   = "confclient/interface_conf";

-    world.winDB.legal_ids  = "012cilma";
+    world.winDB.legal_ids  = "012cilm";

     char * path_server_in  = "server/in";
     char * path_server_out = "server/out";
 
     char * path_server_in  = "server/in";
     char * path_server_out = "server/out";
 

diff --git a/src/client/windows.c b/src/client/windows.c
index 6884ddf1e242a7e819fd190f3a3098e408bfd011..576cd56e81ba4897c4494783b1ee368c21d6d223 100644 (file)
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -21,10 +21,9 @@
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(),
                         * draw_win_inventory(), draw_win_info(), draw_win_log(),
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(),
                         * draw_win_inventory(), draw_win_info(), draw_win_log(),

-                        * draw_win_active_windows_keys(), draw_win_map(),

                         * draw_win_keybindings_winconf_keybindings(),
                         * draw_win_keybindings_winconf_geometry(),
                         * draw_win_keybindings_winconf_keybindings(),
                         * draw_win_keybindings_winconf_geometry(),

-                        * draw_win_keybindings_global()
+                        * draw_win_keybindings_global(), draw_win_map()

                         */
 #include "wincontrol.h" /* toggle_window() */
 #include "world.h" /* world */
                         */
 #include "wincontrol.h" /* toggle_window() */
 #include "world.h" /* world */


@@ -121,7 +120,6 @@ static void (* get_drawfunc_by_char(char c)) ()
     if (   match_func(c, &f, 'c', draw_win_inventory)
         || match_func(c, &f, 'i', draw_win_info)
         || match_func(c, &f, 'l', draw_win_log)
     if (   match_func(c, &f, 'c', draw_win_inventory)
         || match_func(c, &f, 'i', draw_win_info)
         || match_func(c, &f, 'l', draw_win_log)

-        || match_func(c, &f, 'a', draw_win_active_windows_keys)

         || match_func(c, &f, 'm', draw_win_map)
         || match_func(c, &f, '0', draw_win_keybindings_global)
         || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry)
         || match_func(c, &f, 'm', draw_win_map)
         || match_func(c, &f, '0', draw_win_keybindings_global)
         || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry)