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

Merge branch 'zugz-reduceRedrawing'

Browse Source
This commit is contained in:
jfreegman 2017-10-29 16:00:46 -04:00
commit e844ece28b
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/friendlist.c
View File

@ -666,7 +666,7 @@ static void draw_del_popup(void)
wattroff(PendingDelete.popup, A_BOLD); wattroff(PendingDelete.popup, A_BOLD);
wprintw(PendingDelete.popup, "? y/n"); wprintw(PendingDelete.popup, "? y/n");
wrefresh(PendingDelete.popup); wnoutrefresh(PendingDelete.popup);
} }
/* deletes contact from blocked list */ /* deletes contact from blocked list */
@ -895,7 +895,7 @@ static void blocklist_onDraw(ToxWindow *self, Tox *m, int y2, int x2)
wprintw(self->window, "%02X", Blocked.list[selected_num].pub_key[i] & 0xff); wprintw(self->window, "%02X", Blocked.list[selected_num].pub_key[i] & 0xff);
} }
wrefresh(self->window); wnoutrefresh(self->window);
draw_del_popup(); draw_del_popup();
if (self->help->active) if (self->help->active)
@ -1112,7 +1112,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
wprintw(self->window, "%02X", Friends.list[selected_num].pub_key[i] & 0xff); wprintw(self->window, "%02X", Friends.list[selected_num].pub_key[i] & 0xff);
} }
wrefresh(self->window); wnoutrefresh(self->window);
draw_del_popup(); draw_del_popup();
if (self->help->active) if (self->help->active)

2
src/groupchat.c
View File

@ -693,7 +693,7 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos)); int new_x = ctx->start ? x2 - 1 : MAX(0, wcswidth(ctx->line, ctx->pos));
wmove(self->window, y + 1, new_x); wmove(self->window, y + 1, new_x);
wrefresh(self->window); wnoutrefresh(self->window);
if (self->help->active) if (self->help->active)
help_onDraw(self); help_onDraw(self);

16
src/help.c
View File

@ -127,7 +127,7 @@ static void help_draw_menu(ToxWindow *self)
wprintw(win, "it menu\n"); wprintw(win, "it menu\n");
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
static void help_draw_bottom_menu(WINDOW *win) static void help_draw_bottom_menu(WINDOW *win)
@ -211,7 +211,7 @@ static void help_draw_global(ToxWindow *self)
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
static void help_draw_chat(ToxWindow *self) static void help_draw_chat(ToxWindow *self)
@ -255,7 +255,7 @@ static void help_draw_chat(ToxWindow *self)
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
static void help_draw_keys(ToxWindow *self) static void help_draw_keys(ToxWindow *self)
@ -281,7 +281,7 @@ static void help_draw_keys(ToxWindow *self)
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
static void help_draw_group(ToxWindow *self) static void help_draw_group(ToxWindow *self)
@ -299,7 +299,7 @@ static void help_draw_group(ToxWindow *self)
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
#ifdef PYTHON #ifdef PYTHON
@ -318,7 +318,7 @@ static void help_draw_plugin(ToxWindow *self)
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
#endif #endif
@ -341,7 +341,7 @@ static void help_draw_contacts(ToxWindow *self)
help_draw_bottom_menu(win); help_draw_bottom_menu(win);
box(win, ACS_VLINE, ACS_HLINE); box(win, ACS_VLINE, ACS_HLINE);
wrefresh(win); wnoutrefresh(win);
} }
void help_onKey(ToxWindow *self, wint_t key) void help_onKey(ToxWindow *self, wint_t key)
@ -411,8 +411,6 @@ void help_onKey(ToxWindow *self, wint_t key)
void help_onDraw(ToxWindow *self) void help_onDraw(ToxWindow *self)
{ {
curs_set(0);
switch (self->help->type) { switch (self->help->type) {
case HELP_MENU: case HELP_MENU:
help_draw_menu(self); help_draw_menu(self);