about summary refs log tree commit diff stats
path: root/src/ui/console.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-09-25 23:59:36 +0100
committerJames Booth <boothj5@gmail.com>2016-09-25 23:59:36 +0100
commit7b05e50ffc5d338c4408d0181a9b5efe646757d8 (patch)
treefd1dc408463a9997aec792caeb34103594f6c303 /src/ui/console.c
parent4521ad9e113bb8ea466a9e718e62204a9c323b7f (diff)
parente5416cd5d5add9fe7a7c469e9c437ec57fd8f66b (diff)
downloadprofani-tty-7b05e50ffc5d338c4408d0181a9b5efe646757d8.tar.gz
Merge branch 'win-order'
Diffstat (limited to 'src/ui/console.c')
-rw-r--r--src/ui/console.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/ui/console.c b/src/ui/console.c
index 3b99e58e..98967206 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1339,17 +1339,17 @@ cons_vercheck_setting(void)
 }
 
 void
-cons_titlebar_setting(void)
+cons_wintitle_setting(void)
 {
-    if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
-        cons_show("Titlebar show (/titlebar)           : ON");
+    if (prefs_get_boolean(PREF_WINTITLE_SHOW)) {
+        cons_show("Window title show (/wintitle)       : ON");
     } else {
-        cons_show("Titlebar show (/titlebar)           : OFF");
+        cons_show("Window title show (/wintitle)       : OFF");
     }
-    if (prefs_get_boolean(PREF_TITLEBAR_GOODBYE)) {
-        cons_show("Titlebar goodbye (/titlebar)        : ON");
+    if (prefs_get_boolean(PREF_WINTITLE_GOODBYE)) {
+        cons_show("Window title goodbye (/wintitle)    : ON");
     } else {
-        cons_show("Titlebar goodbye (/titlebar)        : OFF");
+        cons_show("Window title goodbye (/wintitle)    : OFF");
     }
 }
 
@@ -1534,7 +1534,7 @@ cons_show_ui_prefs(void)
     cons_beep_setting();
     cons_flash_setting();
     cons_splash_setting();
-    cons_inputwin_setting();
+    cons_winpos_setting();
     cons_wrap_setting();
     cons_winstidy_setting();
     cons_time_setting();
@@ -1544,7 +1544,7 @@ cons_show_ui_prefs(void)
     cons_occupants_setting();
     cons_roster_setting();
     cons_privileges_setting();
-    cons_titlebar_setting();
+    cons_wintitle_setting();
     cons_encwarn_setting();
     cons_presence_setting();
     cons_inpblock_setting();
@@ -1753,11 +1753,14 @@ cons_inpblock_setting(void)
 }
 
 void
-cons_inputwin_setting(void)
+cons_winpos_setting(void)
 {
-    char *pos = prefs_get_string(PREF_INPUTWIN);
-    cons_show("Input window postion (/inputwin)    : %s", pos);
-    prefs_free_string(pos);
+    ProfWinPlacement *placement = prefs_get_win_placement();
+    cons_show("Title bar postion (/titlebar)       : %d", placement->titlebar_pos);
+    cons_show("Main window postion (/mainwin)      : %d", placement->mainwin_pos);
+    cons_show("Status bar postion (/statusbar)     : %d", placement->statusbar_pos);
+    cons_show("Input window postion (/inputwin)    : %d", placement->inputwin_pos);
+    prefs_free_win_placement(placement);
 }
 
 void