Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 15:13:03 +01:00
Code Issues Projects Releases Wiki Activity

update settings and docs with peerlist-toggle keybinding

Browse Source
This commit is contained in:
Jfreegman 2014-10-08 02:56:54 -04:00
parent e6b18231c0
commit d3a489b756
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/toxic.conf.5
View File

@ -2,12 +2,12 @@
.\" Title: toxic.conf .\" Title: toxic.conf
.\" Author: [see the "AUTHORS" section] .\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 2014-09-19 .\" Date: 2014-09-26
.\" Manual: Toxic Manual .\" Manual: Toxic Manual
.\" Source: toxic __VERSION__ .\" Source: toxic __VERSION__
.\" Language: English .\" Language: English
.\" .\"
.TH "TOXIC\&.CONF" "5" "2014\-09\-19" "toxic __VERSION__" "Toxic Manual" .TH "TOXIC\&.CONF" "5" "2014\-09\-26" "toxic __VERSION__" "Toxic Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
@ -256,6 +256,11 @@ Key combination to scroll contacts list up\&.
.RS 4 .RS 4
Key combination to scroll contacts list down\&. Key combination to scroll contacts list down\&.
.RE .RE
.PP
\fBtoggle_peerlist\fR
.RS 4
Toggle the peer list on and off\&.
.RE
.RE .RE
.SH "FILES" .SH "FILES"
.PP .PP

3
doc/toxic.conf.5.asc
View File

@ -161,6 +161,9 @@ OPTIONS
*peer_list_down*;; *peer_list_down*;;
Key combination to scroll contacts list down. Key combination to scroll contacts list down.
*toggle_peerlist*;;
Toggle the peer list on and off.
FILES FILES
----- -----

1
misc/toxic.conf.example
View File

@ -76,5 +76,6 @@ keys = {
page_bottom="Ctrl+H"; page_bottom="Ctrl+H";
peer_list_up="Ctrl+["; peer_list_up="Ctrl+[";
peer_list_down="Ctrl+]"; peer_list_down="Ctrl+]";
toggle_peerlist="Ctrl+b";
}; };

3
src/help.c
View File

@ -218,6 +218,7 @@ static void help_draw_keys(ToxWindow *self)
wprintw(win, " Ctrl+F and Ctrl+V : Scroll window history half a page\n"); wprintw(win, " Ctrl+F and Ctrl+V : Scroll window history half a page\n");
wprintw(win, " Ctrl+H : Move to the bottom of window history\n"); wprintw(win, " Ctrl+H : Move to the bottom of window history\n");
wprintw(win, " Ctrl+[ and Ctrl+] : Scroll peer list in groupchats\n\n"); wprintw(win, " Ctrl+[ and Ctrl+] : Scroll peer list in groupchats\n\n");
wprintw(win, " Ctrl+b : Toggle the groupchat peerlist\n\n");
wprintw(win, " (Note: Custom keybindings override these defaults.)\n\n"); wprintw(win, " (Note: Custom keybindings override these defaults.)\n\n");
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
@ -280,7 +281,7 @@ void help_onKey(ToxWindow *self, wint_t key)
break; break;
case 'k': case 'k':
help_init_window(self, 12, 80); help_init_window(self, 13, 80);
self->help->type = HELP_KEYS; self->help->type = HELP_KEYS;
break; break;

6
src/settings.c
View File

@ -92,6 +92,7 @@ static const struct keys_strings {
const char* page_bottom; const char* page_bottom;
const char* peer_list_up; const char* peer_list_up;
const char* peer_list_down; const char* peer_list_down;
const char* toggle_peerlist;
} key_strings = { } key_strings = {
"keys", "keys",
"next_tab", "next_tab",
@ -102,7 +103,8 @@ static const struct keys_strings {
"half_page_down", "half_page_down",
"page_bottom", "page_bottom",
"peer_list_up", "peer_list_up",
"peer_list_down" "peer_list_down",
"toggle_peerlist",
}; };
/* defines from toxic.h */ /* defines from toxic.h */
@ -117,6 +119,7 @@ static void key_defaults(struct user_settings* settings)
settings->key_page_bottom = T_KEY_C_H; settings->key_page_bottom = T_KEY_C_H;
settings->key_peer_list_up = T_KEY_C_LB; settings->key_peer_list_up = T_KEY_C_LB;
settings->key_peer_list_down = T_KEY_C_RB; settings->key_peer_list_down = T_KEY_C_RB;
settings->key_toggle_peerlist = T_KEY_C_B;
} }
static const struct tox_strings { static const struct tox_strings {
@ -305,6 +308,7 @@ int settings_load(struct user_settings *s, const char *patharg)
if (config_setting_lookup_string(setting, key_strings.page_bottom, &tmp)) s->key_page_bottom = key_parse(&tmp); if (config_setting_lookup_string(setting, key_strings.page_bottom, &tmp)) s->key_page_bottom = key_parse(&tmp);
if (config_setting_lookup_string(setting, key_strings.peer_list_up, &tmp)) s->key_peer_list_up = key_parse(&tmp); if (config_setting_lookup_string(setting, key_strings.peer_list_up, &tmp)) s->key_peer_list_up = key_parse(&tmp);
if (config_setting_lookup_string(setting, key_strings.peer_list_down, &tmp)) s->key_peer_list_down = key_parse(&tmp); if (config_setting_lookup_string(setting, key_strings.peer_list_down, &tmp)) s->key_peer_list_down = key_parse(&tmp);
if (config_setting_lookup_string(setting, key_strings.toggle_peerlist, &tmp)) s->key_toggle_peerlist = key_parse(&tmp);
} }
#ifdef AUDIO #ifdef AUDIO

1
src/settings.h
View File

@ -50,6 +50,7 @@ struct user_settings {
int key_page_bottom; int key_page_bottom;
int key_peer_list_up; int key_peer_list_up;
int key_peer_list_down; int key_peer_list_down;
int key_toggle_peerlist;
#ifdef AUDIO #ifdef AUDIO
int audio_in_dev; int audio_in_dev;