Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-09-28 04:15:36 +02:00
Code Issues Projects Releases Wiki Activity

various fixes

Browse Source
This commit is contained in:
Jfreegman 2014-06-20 14:27:33 -04:00
parent 034a8f5d8b
commit 3e797db16e
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/groupchat.c
View File

@ -521,14 +521,14 @@ static void groupchat_onKey(ToxWindow *self, Tox *m, wint_t key, bool ltr)
} }
/* Scroll peerlist up and down one position if list overflows window */ /* Scroll peerlist up and down one position if list overflows window */
else if (key == T_KEY_C_LB) { else if (key == T_KEY_C_RB) {
int L = y2 - CHATBOX_HEIGHT - SDBAR_OFST; int L = y2 - CHATBOX_HEIGHT - SDBAR_OFST;
if (groupchats[self->num].side_pos < groupchats[self->num].num_peers - L) if (groupchats[self->num].side_pos < groupchats[self->num].num_peers - L)
++groupchats[self->num].side_pos; ++groupchats[self->num].side_pos;
} }
else if (key == T_KEY_C_RB) { else if (key == T_KEY_C_LB) {
if (groupchats[self->num].side_pos > 0) if (groupchats[self->num].side_pos > 0)
--groupchats[self->num].side_pos; --groupchats[self->num].side_pos;
} }

17
src/line_info.c
View File

@ -56,14 +56,15 @@ static void line_info_reset_start(ToxWindow *self, struct history *hst)
getmaxyx(self->window, y2, x2); getmaxyx(self->window, y2, x2);
struct line_info *line = hst->line_end; struct line_info *line = hst->line_end;
uint16_t lncnt = 0; uint16_t lncnt = 0;
int side_offst = self->is_groupchat ? SIDEBAR_WIDTH : 0; int side_offst = self->is_groupchat ? SIDEBAR_WIDTH : 0;
int top_offst = self->is_chat ? 3 : 0; int top_offst = self->is_chat ? 2 : 0;
int max_y = (y2 - CHATBOX_HEIGHT - top_offst); int max_y = (y2 - CHATBOX_HEIGHT - top_offst);
while (line->prev && lncnt < max_y) { while (line->prev && lncnt < max_y) {
lncnt += (1 + line->newlines) +( line->len / (x2 - side_offst));
line = line->prev; line = line->prev;
lncnt += (1 + line->len / (x2 - side_offst));
} }
hst->line_start = line; hst->line_start = line;
@ -441,11 +442,11 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
switch (key) { switch (key) {
/* TODO: Find good key bindings for all this stuff */ /* TODO: Find good key bindings for all this stuff */
case T_KEY_C_H: case T_KEY_C_F:
line_info_page_up(self, hst); line_info_page_up(self, hst);
break; break;
case T_KEY_C_B: case T_KEY_C_V:
line_info_page_down(self, hst); line_info_page_down(self, hst);
break; break;
@ -459,12 +460,12 @@ bool line_info_onKey(ToxWindow *self, wint_t key)
/* case ?: /* case ?:
line_info_goto_root(hst); line_info_goto_root(hst);
break;
case ?:
line_info_reset_start(self, hst);
break; */ break; */
case T_KEY_C_H:
line_info_reset_start(self, hst);
break;
default: default:
match = false; match = false;
break; break;

3
src/toxic.h
View File

@ -50,7 +50,8 @@
#define T_KEY_C_A 0x01 /* ctrl-a */ #define T_KEY_C_A 0x01 /* ctrl-a */
#define T_KEY_C_RB 0x1D /* ctrl-] */ #define T_KEY_C_RB 0x1D /* ctrl-] */
#define T_KEY_C_LB 0x1B /* ctrl-[ */ #define T_KEY_C_LB 0x1B /* ctrl-[ */
#define T_KEY_C_B 0x02 /* ctrl-b */ #define T_KEY_C_V 0x16 /* ctrl-v */
#define T_KEY_C_F 0x06 /* ctrl-f */
#define T_KEY_C_H 0x08 /* ctrl-h */ #define T_KEY_C_H 0x08 /* ctrl-h */
enum { enum {