1
0
Fork 0

Add /inputwin top|bottom command

closes #853
This commit is contained in:
James Booth 2016-09-19 23:40:45 +01:00
parent c4d3f19d94
commit 0aa758cbfb
22 changed files with 162 additions and 18 deletions

View File

@ -194,6 +194,7 @@ static Autocomplete blocked_ac;
static Autocomplete tray_ac;
static Autocomplete presence_ac;
static Autocomplete presence_setting_ac;
static Autocomplete inputwin_ac;
void
cmd_ac_init(void)
@ -735,6 +736,10 @@ cmd_ac_init(void)
autocomplete_add(presence_setting_ac, "all");
autocomplete_add(presence_setting_ac, "online");
autocomplete_add(presence_setting_ac, "none");
inputwin_ac = autocomplete_new();
autocomplete_add(inputwin_ac, "top");
autocomplete_add(inputwin_ac, "bottom");
}
void
@ -998,6 +1003,7 @@ cmd_ac_reset(ProfWin *window)
autocomplete_reset(tray_ac);
autocomplete_reset(presence_ac);
autocomplete_reset(presence_setting_ac);
autocomplete_reset(inputwin_ac);
autocomplete_reset(script_ac);
if (script_show_ac) {
@ -1120,6 +1126,7 @@ cmd_ac_uninit(void)
autocomplete_free(tray_ac);
autocomplete_free(presence_ac);
autocomplete_free(presence_setting_ac);
autocomplete_free(inputwin_ac);
}
static char*
@ -1200,8 +1207,8 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
}
}
gchar *cmds[] = { "/prefs", "/disco", "/room", "/autoping" };
Autocomplete completers[] = { prefs_ac, disco_ac, room_ac, autoping_ac };
gchar *cmds[] = { "/prefs", "/disco", "/room", "/autoping", "/inputwin" };
Autocomplete completers[] = { prefs_ac, disco_ac, room_ac, autoping_ac, inputwin_ac };
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE);
@ -1250,7 +1257,7 @@ _cmd_ac_complete_params(ProfWin *window, const char *const input)
g_hash_table_insert(ac_funcs, "/sendfile", _sendfile_autocomplete);
g_hash_table_insert(ac_funcs, "/blocked", _blocked_autocomplete);
g_hash_table_insert(ac_funcs, "/tray", _tray_autocomplete);
g_hash_table_insert(ac_funcs, "/presence", _presence_autocomplete);
g_hash_table_insert(ac_funcs, "/presence", _presence_autocomplete);
int len = strlen(input);
char parsed[len+1];

View File

@ -1302,6 +1302,23 @@ static struct cmd_t command_defs[] =
CMD_NOEXAMPLES
},
{ "/inputwin",
parse_args, 1, 1, &cons_inputwin_setting,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_inputwin)
CMD_TAGS(
CMD_TAG_UI)
CMD_SYN(
"/inputwin top",
"/inputwin bottom")
CMD_DESC(
"Where to display the input window.")
CMD_ARGS(
{ "top", "Show the input window at the top of the screen." },
{ "bottom", "Show the input window at the bottom of the screen." })
CMD_NOEXAMPLES
},
{ "/notify",
parse_args_with_freetext, 0, 4, NULL,
CMD_NOSUBFUNCS

View File

@ -1662,7 +1662,7 @@ cmd_theme(ProfWin *window, const char *const command, gchar **args)
} else {
ui_hide_all_room_rosters();
}
ui_redraw();
ui_resize();
cons_show("Loaded theme: %s", args[1]);
} else {
cons_show("Couldn't find theme: %s", args[1]);
@ -5522,6 +5522,20 @@ cmd_inpblock(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
gboolean
cmd_inputwin(ProfWin *window, const char *const command, gchar **args)
{
if ((g_strcmp0(args[0], "top") == 0) || (g_strcmp0(args[0], "bottom") == 0)) {
prefs_set_string(PREF_INPUTWIN, args[0]);
ui_resize();
cons_show("Set input window position to %s", args[0]);
} else {
cons_bad_cmd_usage(command);
}
return TRUE;
}
gboolean
cmd_log(ProfWin *window, const char *const command, gchar **args)
{

View File

@ -149,6 +149,7 @@ gboolean cmd_wrap(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_time(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_resource(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_inpblock(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_inputwin(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_encwarn(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_script(ProfWin *window, const char *const command, gchar **args);
gboolean cmd_export(ProfWin *window, const char *const command, gchar **args);

View File

@ -1211,6 +1211,7 @@ _get_group(preference_t pref)
case PREF_RESOURCE_MESSAGE:
case PREF_ENC_WARN:
case PREF_INPBLOCK_DYNAMIC:
case PREF_INPUTWIN:
case PREF_TLS_SHOW:
case PREF_CONSOLE_MUC:
case PREF_CONSOLE_PRIVATE:
@ -1443,6 +1444,8 @@ _get_key(preference_t pref)
return "resource.message";
case PREF_INPBLOCK_DYNAMIC:
return "inpblock.dynamic";
case PREF_INPUTWIN:
return "inputwin.position";
case PREF_ENC_WARN:
return "enc.warn";
case PREF_PGP_LOG:
@ -1571,6 +1574,8 @@ _get_default_string(preference_t pref)
case PREF_CONSOLE_PRIVATE:
case PREF_CONSOLE_CHAT:
return "all";
case PREF_INPUTWIN:
return "bottom";
default:
return NULL;
}

View File

@ -132,6 +132,7 @@ typedef enum {
PREF_RESOURCE_TITLE,
PREF_RESOURCE_MESSAGE,
PREF_INPBLOCK_DYNAMIC,
PREF_INPUTWIN,
PREF_ENC_WARN,
PREF_PGP_LOG,
PREF_TLS_CERTPATH,

View File

@ -150,6 +150,8 @@ theme_init(const char *const theme_name)
g_hash_table_insert(defaults, strdup("roster.room.trigger"), strdup("green"));
g_hash_table_insert(defaults, strdup("roster.room.mention"), strdup("green"));
g_hash_table_insert(defaults, strdup("occupants.header"), strdup("yellow"));
_load_preferences();
}
gboolean
@ -427,7 +429,7 @@ _load_preferences(void)
_set_string_preference("roster.rooms.by", PREF_ROSTER_ROOMS_BY);
_set_string_preference("roster.private", PREF_ROSTER_PRIVATE);
_set_string_preference("roster.count", PREF_ROSTER_COUNT);
_set_string_preference("inputwin.position", PREF_INPUTWIN);
if (g_key_file_has_key(theme, "ui", "occupants.size", NULL)) {
gint occupants_size = g_key_file_get_integer(theme, "ui", "occupants.size", NULL);

View File

@ -1534,6 +1534,7 @@ cons_show_ui_prefs(void)
cons_beep_setting();
cons_flash_setting();
cons_splash_setting();
cons_inputwin_setting();
cons_wrap_setting();
cons_winstidy_setting();
cons_time_setting();
@ -1751,6 +1752,14 @@ cons_inpblock_setting(void)
}
}
void
cons_inputwin_setting(void)
{
char *pos = prefs_get_string(PREF_INPUTWIN);
cons_show("Input window postion (/inputwin) : %s", pos);
prefs_free_string(pos);
}
void
cons_log_setting(void)
{

View File

@ -282,7 +282,14 @@ _inp_win_update_virtual(void)
{
int wrows, wcols;
getmaxyx(stdscr, wrows, wcols);
pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(inp_win, 0, pad_start, 0, 0, 0, wcols-2);
} else {
pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
}
prefs_free_string(pos);
}
static void

View File

@ -89,7 +89,13 @@ create_status_bar(void)
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
status_bar = newwin(1, cols, rows-2, 0);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
status_bar = newwin(1, cols, rows-1, 0);
} else {
status_bar = newwin(1, cols, rows-2, 0);
}
prefs_free_string(pos);
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
wattron(status_bar, bracket_attrs);
mvwprintw(status_bar, 0, cols - 34, _active);
@ -122,7 +128,13 @@ status_bar_resize(void)
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
mvwin(status_bar, rows-2, 0);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
mvwin(status_bar, rows-1, 0);
} else {
mvwin(status_bar, rows-2, 0);
}
prefs_free_string(pos);
wresize(status_bar, 1, cols);
wbkgd(status_bar, theme_attrs(THEME_STATUS_TEXT));
wattron(status_bar, bracket_attrs);

View File

@ -67,7 +67,13 @@ create_title_bar(void)
{
int cols = getmaxx(stdscr);
win = newwin(1, cols, 0, 0);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
win = newwin(1, cols, 1, 0);
} else {
win = newwin(1, cols, 0, 0);
}
prefs_free_string(pos);
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
title_bar_console();
title_bar_set_presence(CONTACT_OFFLINE);
@ -101,6 +107,16 @@ title_bar_resize(void)
{
int cols = getmaxx(stdscr);
werase(win);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
mvwin(win, 1, 0);
} else {
mvwin(win, 0, 0);
}
prefs_free_string(pos);
wresize(win, 1, cols);
wbkgd(win, theme_attrs(THEME_TITLE_TEXT));

View File

@ -317,6 +317,7 @@ void cons_reconnect_setting(void);
void cons_autoping_setting(void);
void cons_autoconnect_setting(void);
void cons_inpblock_setting(void);
void cons_inputwin_setting(void);
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity);
void cons_show_contact_offline(PContact contact, char *resource, char *status);
void cons_theme_properties(void);

View File

@ -616,13 +616,32 @@ win_update_virtual(ProfWin *window)
} else {
subwin_cols = win_roster_cols();
}
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 2, (cols-subwin_cols), rows-2, cols-1);
} else {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
}
prefs_free_string(pos);
} else {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, cols-1);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, cols-1);
} else {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, cols-1);
}
prefs_free_string(pos);
}
} else {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 1, 0, rows-3, cols-1);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 2, 0, rows-2, cols-1);
} else {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 1, 0, rows-3, cols-1);
}
prefs_free_string(pos);
}
}
@ -633,7 +652,13 @@ win_refresh_without_subwin(ProfWin *window)
getmaxyx(stdscr, rows, cols);
if ((window->type == WIN_MUC) || (window->type == WIN_CONSOLE)) {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 1, 0, rows-3, cols-1);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 2, 0, rows-2, cols-1);
} else {
pnoutrefresh(window->layout->win, window->layout->y_pos, 0, 1, 0, rows-3, cols-1);
}
prefs_free_string(pos);
}
}
@ -647,13 +672,27 @@ win_refresh_with_subwin(ProfWin *window)
if (window->type == WIN_MUC) {
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
subwin_cols = win_occpuants_cols();
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 2, (cols-subwin_cols), rows-2, cols-1);
} else {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
}
prefs_free_string(pos);
} else if (window->type == WIN_CONSOLE) {
ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
subwin_cols = win_roster_cols();
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
char *pos = prefs_get_string(PREF_INPUTWIN);
if (g_strcmp0(pos, "top") == 0) {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 2, 0, rows-2, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 2, (cols-subwin_cols), rows-2, cols-1);
} else {
pnoutrefresh(layout->base.win, layout->base.y_pos, 0, 1, 0, rows-3, (cols-subwin_cols)-1);
pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, 1, (cols-subwin_cols), rows-3, cols-1);
}
prefs_free_string(pos);
}
}

View File

@ -445,6 +445,7 @@ void cons_reconnect_setting(void) {}
void cons_autoping_setting(void) {}
void cons_autoconnect_setting(void) {}
void cons_inpblock_setting(void) {}
void cons_inputwin_setting(void) {}
void cons_tray_setting(void) {}
void cons_show_contact_online(PContact contact, Resource *resource, GDateTime *last_activity)

View File

@ -138,3 +138,4 @@ pgp.char=
console.muc=
console.chat=
console.private=
inputwin.position=

View File

@ -130,3 +130,4 @@ otr.char=@
pgp.char=%
tls.show=true
console.muc=first
inputwin.position=bottom

View File

@ -137,3 +137,4 @@ tls.show=true
console.muc=first
console.chat=all
console.private=all
inputwin.position=bottom

View File

@ -133,3 +133,4 @@ tls.show=true
console.muc=first
console.chat=all
console.private=all
inputwin.position=bottom

View File

@ -58,3 +58,4 @@ tls.show=true
console.muc=all
console.chat=all
console.private=all
inputwin.position=bottom

View File

@ -75,3 +75,6 @@ roster.room.mention=bold_green
roster.room.trigger=bold_green
occupants.header=bold_green
receipt.sent=bold_black
[ui]
inputwin.position=top

View File

@ -75,3 +75,6 @@ roster.room.mention=green
roster.room.trigger=green
occupants.header=yellow
receipt.sent=red
[ui]
inputwin.position=bottom

View File

@ -45,3 +45,4 @@ tls.show=false
console.muc=first
console.chat=first
console.private=first
inputwin.position=bottom