aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Handle occupant list resize

Browse Source
This commit is contained in:
James Booth 2014-10-07 17:06:02 +01:00
parent 0c24b53bfa
commit 639796384a
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ui/ui.h
View File

@ -52,6 +52,7 @@
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
#define INP_WIN_MAX 1000 #define INP_WIN_MAX 1000
#define OCCUPANT_WIN_SIZE 5
void ui_init_module(void); void ui_init_module(void);
void console_init_module(void); void console_init_module(void);

13
src/ui/window.c
View File

@ -46,6 +46,7 @@
#endif #endif
#include "config/theme.h" #include "config/theme.h"
#include "ui/ui.h"
#include "ui/window.h" #include "ui/window.h"
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
@ -60,10 +61,10 @@ win_create(const char * const title, int cols, win_type_t type)
new_win->from = strdup(title); new_win->from = strdup(title);
if (type == WIN_MUC) { if (type == WIN_MUC) {
new_win->win = newpad(PAD_SIZE, (cols/4) * 3); new_win->win = newpad(PAD_SIZE, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1));
wbkgd(new_win->win, COLOUR_TEXT); wbkgd(new_win->win, COLOUR_TEXT);
new_win->subwin = newpad(PAD_SIZE, cols/4); new_win->subwin = newpad(PAD_SIZE, cols/OCCUPANT_WIN_SIZE);
wvline(new_win->subwin, 0, 0); wvline(new_win->subwin, 0, 0);
wbkgd(new_win->subwin, COLOUR_TEXT); wbkgd(new_win->subwin, COLOUR_TEXT);
} else { } else {
@ -92,6 +93,9 @@ win_free(ProfWin* window)
{ {
buffer_free(window->buffer); buffer_free(window->buffer);
delwin(window->win); delwin(window->win);
if (window->subwin) {
delwin(window->subwin);
}
free(window->from); free(window->from);
form_destroy(window->form); form_destroy(window->form);
free(window); free(window);
@ -104,12 +108,11 @@ win_update_virtual(ProfWin *window)
getmaxyx(stdscr, rows, cols); getmaxyx(stdscr, rows, cols);
if (window->type == WIN_MUC) { if (window->type == WIN_MUC) {
pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, ((cols/4) * 3) -1); pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, ((cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1)) -1);
pnoutrefresh(window->subwin, 0, 0, 1, (cols/4) * 3, rows-3, cols-1); pnoutrefresh(window->subwin, 0, 0, 1, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1), rows-3, cols-1);
} else { } else {
pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, cols-1); pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, cols-1);
} }
} }
void void

20
src/ui/windows.c
View File

@ -293,16 +293,24 @@ wins_resize_all(void)
GList *values = g_hash_table_get_values(windows); GList *values = g_hash_table_get_values(windows);
GList *curr = values; GList *curr = values;
while (curr != NULL) { while (curr != NULL) {
ProfWin *window = curr->data; ProfWin *window = curr->data;
wresize(window->win, PAD_SIZE, cols); if (window->type == WIN_MUC) {
win_redraw(window); wresize(window->win, PAD_SIZE, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1));
curr = g_list_next(curr); } else {
wresize(window->win, PAD_SIZE, cols);
}
win_redraw(window);
curr = g_list_next(curr);
} }
g_list_free(values); g_list_free(values);
ProfWin *current_win = wins_get_current(); ProfWin *current_win = wins_get_current();
if (current_win->type == WIN_MUC) {
pnoutrefresh(current_win->win, current_win->y_pos, 0, 1, 0, rows-3, cols-1); pnoutrefresh(current_win->win, current_win->y_pos, 0, 1, 0, rows-3, ((cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1)) -1);
pnoutrefresh(current_win->subwin, 0, 0, 1, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1), rows-3, cols-1);
} else {
pnoutrefresh(current_win->win, current_win->y_pos, 0, 1, 0, rows-3, cols-1);
}
} }
gboolean gboolean