diff options
author | cos <cos> | 2013-05-25 16:22:40 +0200 |
---|---|---|
committer | cos <cos> | 2013-05-25 16:46:02 +0200 |
commit | 77f6e9fa21658bb7954b84c64d460b9d58124bf2 (patch) | |
tree | 2a06696b537387d8221c45b4016d23dc88ece99e /src | |
parent | 166021512b2e39344ff4562323d15a1e2fdea153 (diff) | |
download | ratpoison-77f6e9fa21658bb7954b84c64d460b9d58124bf2.zip |
Deprecate winliststyle variable & functionality.cr/deprecate_winliststyle
Window lists in ratpoison were initially displayed in one row, as modelled by
how :windows work in screen. When originally implementing column display format
an option to select between row & column was introduced.
Setting winliststyle to row has been broken for almost four years. Given that
no error reports have been seen during this time, it is fair to assume no one
is using the functionality.
Since allowing two values of winliststyle complicates the code to display
winlists & requires different code paths for interactive & non-interactive use,
it seems more sane to deprecate the unused feature rather than fix its bug(s).
Diffstat (limited to 'src')
-rw-r--r-- | src/actions.c | 14 | ||||
-rw-r--r-- | src/bar.c | 2 | ||||
-rw-r--r-- | src/data.h | 2 | ||||
-rw-r--r-- | src/main.c | 2 |
4 files changed, 20 insertions, 0 deletions
diff --git a/src/actions.c b/src/actions.c index bb129ae..481c8eb 100644 --- a/src/actions.c +++ b/src/actions.c @@ -68,7 +68,9 @@ static cmdret * set_bgcolor (struct cmdarg **args); static cmdret * set_fwcolor (struct cmdarg **args); static cmdret * set_bwcolor (struct cmdarg **args); static cmdret * set_barpadding (struct cmdarg **args); +#ifdef WINLISTSTYLE static cmdret * set_winliststyle (struct cmdarg **args); +#endif static cmdret * set_framesels (struct cmdarg **args); static cmdret * set_maxundos (struct cmdarg **args); static cmdret * set_infofmt (struct cmdarg **args); @@ -138,7 +140,9 @@ init_set_vars(void) add_set_var ("fwcolor", set_fwcolor, 1, "", arg_STRING); add_set_var ("bwcolor", set_bwcolor, 1, "", arg_STRING); add_set_var ("barpadding", set_barpadding, 2, "", arg_NUMBER, "", arg_NUMBER); +#ifdef WINLISTSTYLE add_set_var ("winliststyle", set_winliststyle, 1, "", arg_STRING); +#endif add_set_var ("framesels", set_framesels, 1, "", arg_STRING); add_set_var ("infofmt", set_infofmt, 1, "", arg_REST); add_set_var ("topkmap", set_topkmap, 1, "", arg_STRING); @@ -2095,6 +2099,13 @@ read_variable (struct argspec *spec, struct sbuf *s, struct cmdarg **arg) if (var == NULL) { cmdret *ret = cmdret_new (RET_FAILURE, "unknown variable '%s'", input); +#ifndef WINLISTSTYLE + if (!strcmp (input, "winliststyle")) + { + cmdret_free(ret); + ret = cmdret_new (RET_FAILURE, "'%s' is deprecated. Please notify ratpoison-devel@nongnu.org if you miss it.", input); + } +#endif free (input); return ret; } @@ -4960,6 +4971,7 @@ cmd_verbexec (int interactive, struct cmdarg **args) return cmdret_new (RET_SUCCESS, NULL); } +#ifdef WINLISTSTYLE static cmdret * set_winliststyle (struct cmdarg **args) { @@ -4975,6 +4987,7 @@ set_winliststyle (struct cmdarg **args) return cmdret_new (RET_SUCCESS, NULL); } +#endif cmdret * cmd_gnext (int interactive, struct cmdarg **args) @@ -5864,6 +5877,7 @@ cmd_compat (int interactive, struct cmdarg **args) add_alias ("deffgcolor", "set fgcolor"); add_alias ("defbgcolor", "set bgcolor"); add_alias ("defbarpadding", "set barpadding"); +/* FIXME Deprecate the following alias together with everything else WINLISTSTYLE */ add_alias ("defwinliststyle", "set winliststyle"); add_alias ("defframesels", "set framesels"); add_alias ("defmaxundos", "set maxundos"); @@ -192,12 +192,14 @@ update_window_names (rp_screen *s, char *fmt) bar_buffer = sbuf_new (0); +#ifdef WINLISTSTYLE if(defaults.window_list_style == STYLE_ROW) { get_window_list (fmt, NULL, bar_buffer, &mark_start, &mark_end); marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); } else +#endif { get_window_list (fmt, "\n", bar_buffer, &mark_start, &mark_end); marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); @@ -251,9 +251,11 @@ struct rp_defaults int startup_message; +#ifdef WINLISTSTYLE /* Decides whether the window list is displayed in a row or a column. */ int window_list_style; +#endif /* Pointer warping toggle. */ int warp; @@ -560,7 +560,9 @@ init_defaults (void) defaults.win_name = WIN_NAME_TITLE; defaults.startup_message = 1; defaults.warp = 0; +#ifdef WINLISTSTYLE defaults.window_list_style = STYLE_COLUMN; +#endif defaults.history_size = 20; defaults.history_compaction = True; |