diff options
author | James Booth <boothj5@gmail.com> | 2015-06-02 20:32:07 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-02 20:32:07 +0100 |
commit | a3693cfbe744c6ba8274b56a437f1faaaad414bf (patch) | |
tree | 6938c09c2f9dfc831a710f6e0dc9b2f93b500a21 /src | |
parent | 06fe9bec371f99a29c7de1858fbefe5e10c56882 (diff) | |
parent | f0f3a739f4f6963d9ed3300f4b9ef8116ec39ba3 (diff) | |
download | profani-tty-a3693cfbe744c6ba8274b56a437f1faaaad414bf.tar.gz |
Merge branch 'master' into openpgp
Diffstat (limited to 'src')
-rw-r--r-- | src/command/command.c | 10 | ||||
-rw-r--r-- | src/command/commands.c | 25 | ||||
-rw-r--r-- | src/command/commands.h | 1 | ||||
-rw-r--r-- | src/config/preferences.c | 4 | ||||
-rw-r--r-- | src/config/preferences.h | 1 | ||||
-rw-r--r-- | src/config/theme.c | 1 | ||||
-rw-r--r-- | src/ui/console.c | 10 | ||||
-rw-r--r-- | src/ui/core.c | 10 | ||||
-rw-r--r-- | src/ui/ui.h | 3 |
9 files changed, 53 insertions, 12 deletions
diff --git a/src/command/command.c b/src/command/command.c index c08df1c2..4599a022 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -684,6 +684,14 @@ static struct cmd_t command_defs[] = "Enable or disable word wrapping in the main window.", NULL } } }, + { "/winstidy", + cmd_winstidy, parse_args, 1, 1, &cons_winstidy_setting, + { "/winstidy on|off", "Auto tidy windows.", + { "/winstidy on|off", + "----------------", + "Enable or disable auto window tidy.", + NULL } } }, + { "/time", cmd_time, parse_args, 1, 2, &cons_time_setting, { "/time setting|statusbar [setting]", "Time display.", @@ -1941,7 +1949,7 @@ _cmd_complete_parameters(const char * const input) // autocomplete boolean settings gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype", "/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history", - "/vercheck", "/privileges", "/presence", "/wrap", "/carbons" }; + "/vercheck", "/privileges", "/presence", "/wrap", "/winstidy", "/carbons" }; for (i = 0; i < ARRAY_SIZE(boolean_choices); i++) { result = autocomplete_param_with_func(input, boolean_choices[i], prefs_autocomplete_boolean_choice); diff --git a/src/command/commands.c b/src/command/commands.c index b06b1a13..7e2294a0 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -700,7 +700,11 @@ cmd_wins(gchar **args, struct cmd_help_t help) if (args[0] == NULL) { cons_show_wins(); } else if (strcmp(args[0], "tidy") == 0) { - ui_tidy_wins(); + if (ui_tidy_wins()) { + cons_show("Windows tidied."); + } else { + cons_show("No tidy needed."); + } } else if (strcmp(args[0], "prune") == 0) { ui_prune_wins(); } else if (strcmp(args[0], "swap") == 0) { @@ -730,6 +734,18 @@ cmd_wins(gchar **args, struct cmd_help_t help) } gboolean +cmd_winstidy(gchar **args, struct cmd_help_t help) +{ + gboolean result = _cmd_set_boolean_preference(args[0], help, "Wins Auto Tidy", PREF_WINS_AUTO_TIDY); + + if (result && g_strcmp0(args[0], "on") == 0) { + ui_tidy_wins(); + } + + return result; +} + +gboolean cmd_win(gchar **args, struct cmd_help_t help) { int num = atoi(args[0]); @@ -815,7 +831,7 @@ cmd_help(gchar **args, struct cmd_help_t help) "/carbons", "/chlog", "/flash", "/gone", "/grlog", "/history", "/intype", "/log", "/mouse", "/notify", "/outtype", "/prefs", "/priority", "/reconnect", "/roster", "/splash", "/states", "/statuses", "/theme", - "/titlebar", "/vercheck", "/privileges", "/occupants", "/presence", "/wrap" }; + "/titlebar", "/vercheck", "/privileges", "/occupants", "/presence", "/wrap", "/winstidy" }; _cmd_show_filtered_help("Settings commands", filter, ARRAY_SIZE(filter)); } else if (strcmp(args[0], "navigation") == 0) { @@ -3253,6 +3269,11 @@ cmd_close(gchar **args, struct cmd_help_t help) ui_close_win(index); cons_show("Closed window %d", index); + // Tidy up the window list. + if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) { + ui_tidy_wins(); + } + return TRUE; } diff --git a/src/command/commands.h b/src/command/commands.h index 9fe645e3..8a75c03d 100644 --- a/src/command/commands.h +++ b/src/command/commands.h @@ -126,6 +126,7 @@ gboolean cmd_vercheck(gchar **args, struct cmd_help_t help); gboolean cmd_who(gchar **args, struct cmd_help_t help); gboolean cmd_win(gchar **args, struct cmd_help_t help); gboolean cmd_wins(gchar **args, struct cmd_help_t help); +gboolean cmd_winstidy(gchar **args, struct cmd_help_t help); gboolean cmd_xa(gchar **args, struct cmd_help_t help); gboolean cmd_alias(gchar **args, struct cmd_help_t help); gboolean cmd_xmlconsole(gchar **args, struct cmd_help_t help); diff --git a/src/config/preferences.c b/src/config/preferences.c index 59a6a7ca..b7ca113e 100644 --- a/src/config/preferences.c +++ b/src/config/preferences.c @@ -507,6 +507,7 @@ _get_group(preference_t pref) case PREF_MUC_PRIVILEGES: case PREF_PRESENCE: case PREF_WRAP: + case PREF_WINS_AUTO_TIDY: case PREF_TIME: case PREF_TIME_STATUSBAR: case PREF_ROSTER: @@ -654,6 +655,8 @@ _get_key(preference_t pref) return "presence"; case PREF_WRAP: return "wrap"; + case PREF_WINS_AUTO_TIDY: + return "wins.autotidy"; case PREF_TIME: return "time"; case PREF_TIME_STATUSBAR: @@ -700,6 +703,7 @@ _get_default_boolean(preference_t pref) case PREF_MUC_PRIVILEGES: case PREF_PRESENCE: case PREF_WRAP: + case PREF_WINS_AUTO_TIDY: case PREF_INPBLOCK_DYNAMIC: case PREF_RESOURCE_TITLE: case PREF_RESOURCE_MESSAGE: diff --git a/src/config/preferences.h b/src/config/preferences.h index 4455eca1..d1faca63 100644 --- a/src/config/preferences.h +++ b/src/config/preferences.h @@ -74,6 +74,7 @@ typedef enum { PREF_MUC_PRIVILEGES, PREF_PRESENCE, PREF_WRAP, + PREF_WINS_AUTO_TIDY, PREF_TIME, PREF_TIME_STATUSBAR, PREF_STATUSES, diff --git a/src/config/theme.c b/src/config/theme.c index f73dee19..537771b1 100644 --- a/src/config/theme.c +++ b/src/config/theme.c @@ -428,6 +428,7 @@ _load_preferences(void) _set_boolean_preference("flash", PREF_FLASH); _set_boolean_preference("splash", PREF_SPLASH); _set_boolean_preference("wrap", PREF_WRAP); + _set_boolean_preference("wins.autotidy", PREF_WINS_AUTO_TIDY); _set_string_preference("time", PREF_TIME); _set_string_preference("time.statusbar", PREF_TIME_STATUSBAR); diff --git a/src/ui/console.c b/src/ui/console.c index c8d19825..cb52619e 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -876,6 +876,15 @@ cons_wrap_setting(void) } void +cons_winstidy_setting(void) +{ + if (prefs_get_boolean(PREF_WINS_AUTO_TIDY)) + cons_show("Window Auto Tidy (/winstidy) : ON"); + else + cons_show("Window Auto Tidy (/winstidy) : OFF"); +} + +void cons_presence_setting(void) { if (prefs_get_boolean(PREF_PRESENCE)) @@ -1039,6 +1048,7 @@ cons_show_ui_prefs(void) cons_flash_setting(); cons_splash_setting(); cons_wrap_setting(); + cons_winstidy_setting(); cons_time_setting(); cons_resource_setting(); cons_vercheck_setting(); diff --git a/src/ui/core.c b/src/ui/core.c index e7059ef0..8431371d 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1105,16 +1105,10 @@ ui_close_win(int index) status_bar_active(1); } -void +gboolean ui_tidy_wins(void) { - gboolean tidied = wins_tidy(); - - if (tidied) { - cons_show("Windows tidied."); - } else { - cons_show("No tidy needed."); - } + return wins_tidy(); } void diff --git a/src/ui/ui.h b/src/ui/ui.h index 0ee21be4..29ee6bef 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -216,7 +216,7 @@ void ui_show_all_room_rosters(void); void ui_hide_all_room_rosters(void); gboolean ui_chat_win_exists(const char * const barejid); -void ui_tidy_wins(void); +gboolean ui_tidy_wins(void); void ui_prune_wins(void); gboolean ui_swap_wins(int source_win, int target_win); @@ -305,6 +305,7 @@ void cons_occupants_setting(void); void cons_roster_setting(void); void cons_presence_setting(void); void cons_wrap_setting(void); +void cons_winstidy_setting(void); void cons_time_setting(void); void cons_mouse_setting(void); void cons_statuses_setting(void); |