pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-10 11:43:13 +02:00
Code Activity

Version 0.0.7-pre2 - window management

Browse Source
This commit is contained in:
Sebastien Helleu
2004-06-22 22:21:22 +00:00
parent 095f296529
commit 66ff97166f
42 changed files with 3214 additions and 2998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/curses/gui-display.c
+598 -595
View File
File diff suppressed because it is too large Load Diff
src/gui/curses/gui-input.c
+145 -145
View File
@@ -49,7 +49,7 @@ void
gui_read_keyb ()
{
int key, i;
t_gui_window *ptr_window;
t_gui_view *ptr_view;
char new_char[2];
key = getch ();
@@ -59,16 +59,16 @@ gui_read_keyb ()
{
/* resize event */
case KEY_RESIZE:
gui_calculate_pos_size (gui_current_window);
gui_redraw_window (gui_current_window);
gui_calculate_pos_size (gui_current_view);
gui_redraw_view (gui_current_view);
break;
/* previous window */
/* previous view */
case KEY_F(6):
gui_switch_to_previous_window ();
gui_switch_to_previous_view ();
break;
/* next window */
/* next view */
case KEY_F(7):
gui_switch_to_next_window ();
gui_switch_to_next_view ();
break;
/* remove last infobar message */
case KEY_F(10):
@@ -76,82 +76,82 @@ gui_read_keyb ()
break;
/* cursor up */
case KEY_UP:
if (gui_current_window->ptr_history)
if (gui_current_view->ptr_history)
{
gui_current_window->ptr_history =
gui_current_window->ptr_history->next_history;
if (!gui_current_window->ptr_history)
gui_current_window->ptr_history =
gui_current_window->history;
gui_current_view->ptr_history =
gui_current_view->ptr_history->next_history;
if (!gui_current_view->ptr_history)
gui_current_view->ptr_history =
gui_current_view->history;
}
else
gui_current_window->ptr_history =
gui_current_window->history;
if (gui_current_window->ptr_history)
gui_current_view->ptr_history =
gui_current_view->history;
if (gui_current_view->ptr_history)
{
gui_current_window->input_buffer_size =
strlen (gui_current_window->ptr_history->text);
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->input_buffer_pos =
gui_current_window->input_buffer_size;
strcpy (gui_current_window->input_buffer,
gui_current_window->ptr_history->text);
gui_draw_window_input (gui_current_window);
gui_current_view->input_buffer_size =
strlen (gui_current_view->ptr_history->text);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
strcpy (gui_current_view->input_buffer,
gui_current_view->ptr_history->text);
gui_draw_view_input (gui_current_view);
}
break;
/* cursor down */
case KEY_DOWN:
if (gui_current_window->ptr_history)
if (gui_current_view->ptr_history)
{
gui_current_window->ptr_history =
gui_current_window->ptr_history->prev_history;
if (gui_current_window->ptr_history)
gui_current_window->input_buffer_size =
strlen (gui_current_window->ptr_history->text);
gui_current_view->ptr_history =
gui_current_view->ptr_history->prev_history;
if (gui_current_view->ptr_history)
gui_current_view->input_buffer_size =
strlen (gui_current_view->ptr_history->text);
else
gui_current_window->input_buffer_size = 0;
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->input_buffer_pos =
gui_current_window->input_buffer_size;
if (gui_current_window->ptr_history)
strcpy (gui_current_window->input_buffer,
gui_current_window->ptr_history->text);
gui_draw_window_input (gui_current_window);
gui_current_view->input_buffer_size = 0;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
if (gui_current_view->ptr_history)
strcpy (gui_current_view->input_buffer,
gui_current_view->ptr_history->text);
gui_draw_view_input (gui_current_view);
}
break;
/* cursor left */
case KEY_LEFT:
if (gui_current_window->input_buffer_pos > 0)
if (gui_current_view->input_buffer_pos > 0)
{
gui_current_window->input_buffer_pos--;
gui_draw_window_input (gui_current_window);
gui_current_view->input_buffer_pos--;
gui_draw_view_input (gui_current_view);
}
break;
/* cursor right */
case KEY_RIGHT:
if (gui_current_window->input_buffer_pos <
gui_current_window->input_buffer_size)
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
{
gui_current_window->input_buffer_pos++;
gui_draw_window_input (gui_current_window);
gui_current_view->input_buffer_pos++;
gui_draw_view_input (gui_current_view);
}
break;
/* home key */
case KEY_HOME:
if (gui_current_window->input_buffer_pos > 0)
if (gui_current_view->input_buffer_pos > 0)
{
gui_current_window->input_buffer_pos = 0;
gui_draw_window_input (gui_current_window);
gui_current_view->input_buffer_pos = 0;
gui_draw_view_input (gui_current_view);
}
break;
/* end key */
case KEY_END:
if (gui_current_window->input_buffer_pos <
gui_current_window->input_buffer_size)
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
{
gui_current_window->input_buffer_pos =
gui_current_window->input_buffer_size;
gui_draw_window_input (gui_current_window);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
gui_draw_view_input (gui_current_view);
}
break;
/* page up */
@@ -165,21 +165,21 @@ gui_read_keyb ()
/* erase before cursor and move cursor to the left */
case 127:
case KEY_BACKSPACE:
if (gui_current_window->input_buffer_pos > 0)
if (gui_current_view->input_buffer_pos > 0)
{
i = gui_current_window->input_buffer_pos-1;
while (gui_current_window->input_buffer[i])
i = gui_current_view->input_buffer_pos-1;
while (gui_current_view->input_buffer[i])
{
gui_current_window->input_buffer[i] =
gui_current_window->input_buffer[i+1];
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i+1];
i++;
}
gui_current_window->input_buffer_size--;
gui_current_window->input_buffer_pos--;
gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
gui_draw_window_input (gui_current_window);
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->completion.position = -1;
gui_current_view->input_buffer_size--;
gui_current_view->input_buffer_pos--;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
}
break;
/* Control + Backspace */
@@ -188,93 +188,93 @@ gui_read_keyb ()
break;
/* erase char under cursor */
case KEY_DC:
if (gui_current_window->input_buffer_pos <
gui_current_window->input_buffer_size)
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
{
i = gui_current_window->input_buffer_pos;
while (gui_current_window->input_buffer[i])
i = gui_current_view->input_buffer_pos;
while (gui_current_view->input_buffer[i])
{
gui_current_window->input_buffer[i] =
gui_current_window->input_buffer[i+1];
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i+1];
i++;
}
gui_current_window->input_buffer_size--;
gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
gui_draw_window_input (gui_current_window);
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->completion.position = -1;
gui_current_view->input_buffer_size--;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
}
break;
/* Tab : completion */
case '\t':
completion_search (&(gui_current_window->completion),
CHANNEL(gui_current_window),
gui_current_window->input_buffer,
gui_current_window->input_buffer_size,
gui_current_window->input_buffer_pos);
if (gui_current_window->completion.word_found)
completion_search (&(gui_current_view->completion),
CHANNEL(gui_current_view),
gui_current_view->input_buffer,
gui_current_view->input_buffer_size,
gui_current_view->input_buffer_pos);
if (gui_current_view->completion.word_found)
{
// replace word with new completed word into input buffer
gui_current_window->input_buffer_size +=
gui_current_window->completion.diff_size;
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
gui_current_view->input_buffer_size +=
gui_current_view->completion.diff_size;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
if (gui_current_window->completion.diff_size > 0)
if (gui_current_view->completion.diff_size > 0)
{
for (i = gui_current_window->input_buffer_size - 1;
i >= gui_current_window->completion.position_replace +
(int)strlen (gui_current_window->completion.word_found); i--)
gui_current_window->input_buffer[i] =
gui_current_window->input_buffer[i -
gui_current_window->completion.diff_size];
for (i = gui_current_view->input_buffer_size - 1;
i >= gui_current_view->completion.position_replace +
(int)strlen (gui_current_view->completion.word_found); i--)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i -
gui_current_view->completion.diff_size];
}
else
{
for (i = gui_current_window->completion.position_replace +
strlen (gui_current_window->completion.word_found);
i < gui_current_window->input_buffer_size; i++)
gui_current_window->input_buffer[i] =
gui_current_window->input_buffer[i -
gui_current_window->completion.diff_size];
for (i = gui_current_view->completion.position_replace +
strlen (gui_current_view->completion.word_found);
i < gui_current_view->input_buffer_size; i++)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i -
gui_current_view->completion.diff_size];
}
strncpy (gui_current_window->input_buffer + gui_current_window->completion.position_replace,
gui_current_window->completion.word_found,
strlen (gui_current_window->completion.word_found));
gui_current_window->input_buffer_pos =
gui_current_window->completion.position_replace +
strlen (gui_current_window->completion.word_found);
gui_current_window->completion.position =
gui_current_window->input_buffer_pos;
strncpy (gui_current_view->input_buffer + gui_current_view->completion.position_replace,
gui_current_view->completion.word_found,
strlen (gui_current_view->completion.word_found));
gui_current_view->input_buffer_pos =
gui_current_view->completion.position_replace +
strlen (gui_current_view->completion.word_found);
gui_current_view->completion.position =
gui_current_view->input_buffer_pos;
/* add space or completor to the end of completion, if needed */
if (gui_current_window->completion.base_word[0] == '/')
if (gui_current_view->completion.base_word[0] == '/')
{
if (gui_current_window->input_buffer[gui_current_window->input_buffer_pos] != ' ')
if (gui_current_view->input_buffer[gui_current_view->input_buffer_pos] != ' ')
gui_buffer_insert_string (" ",
gui_current_window->input_buffer_pos);
gui_current_window->completion.position++;
gui_current_window->input_buffer_pos++;
gui_current_view->input_buffer_pos);
gui_current_view->completion.position++;
gui_current_view->input_buffer_pos++;
}
else
{
if (gui_current_window->completion.base_word_pos == 0)
if (gui_current_view->completion.base_word_pos == 0)
{
if (strncmp (gui_current_window->input_buffer + gui_current_window->input_buffer_pos,
if (strncmp (gui_current_view->input_buffer + gui_current_view->input_buffer_pos,
cfg_look_completor, strlen (cfg_look_completor)) != 0)
gui_buffer_insert_string (cfg_look_completor,
gui_current_window->input_buffer_pos);
gui_current_window->completion.position += strlen (cfg_look_completor);
gui_current_window->input_buffer_pos += strlen (cfg_look_completor);
if (gui_current_window->input_buffer[gui_current_window->input_buffer_pos] != ' ')
gui_current_view->input_buffer_pos);
gui_current_view->completion.position += strlen (cfg_look_completor);
gui_current_view->input_buffer_pos += strlen (cfg_look_completor);
if (gui_current_view->input_buffer[gui_current_view->input_buffer_pos] != ' ')
gui_buffer_insert_string (" ",
gui_current_window->input_buffer_pos);
gui_current_window->completion.position++;
gui_current_window->input_buffer_pos++;
gui_current_view->input_buffer_pos);
gui_current_view->completion.position++;
gui_current_view->input_buffer_pos++;
}
}
gui_draw_window_input (gui_current_window);
gui_draw_view_input (gui_current_view);
}
break;
/* escape code (for control-key) */
@@ -284,10 +284,10 @@ gui_read_keyb ()
switch (key)
{
case KEY_LEFT:
gui_switch_to_previous_window ();
gui_switch_to_previous_view ();
break;
case KEY_RIGHT:
gui_switch_to_next_window ();
gui_switch_to_next_view ();
break;
case 79:
/* TODO: replace 79 by constant name! */
@@ -314,35 +314,35 @@ gui_read_keyb ()
break;
/* send command/message */
case '\n':
if (gui_current_window->input_buffer_size > 0)
if (gui_current_view->input_buffer_size > 0)
{
gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
history_add (gui_current_window, gui_current_window->input_buffer);
gui_current_window->input_buffer_size = 0;
gui_current_window->input_buffer_pos = 0;
gui_current_window->input_buffer_1st_display = 0;
gui_current_window->completion.position = -1;
gui_current_window->ptr_history = NULL;
ptr_window = gui_current_window;
user_command (SERVER(gui_current_window),
gui_current_window->input_buffer);
if (ptr_window == gui_current_window)
gui_draw_window_input (ptr_window);
if (ptr_window)
ptr_window->input_buffer[0] = '\0';
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
history_add (gui_current_view, gui_current_view->input_buffer);
gui_current_view->input_buffer_size = 0;
gui_current_view->input_buffer_pos = 0;
gui_current_view->input_buffer_1st_display = 0;
gui_current_view->completion.position = -1;
gui_current_view->ptr_history = NULL;
ptr_view = gui_current_view;
user_command (SERVER(gui_current_view),
gui_current_view->input_buffer);
if (ptr_view == gui_current_view)
gui_draw_view_input (ptr_view);
if (ptr_view)
ptr_view->input_buffer[0] = '\0';
}
break;
/* other key => add to input buffer */
default:
/*gui_printf (gui_current_window,
/*gui_printf (gui_current_view,
"[Debug] key pressed = %d, as octal: %o\n", key, key);*/
new_char[0] = key;
new_char[1] = '\0';
gui_buffer_insert_string (new_char,
gui_current_window->input_buffer_pos);
gui_current_window->input_buffer_pos++;
gui_draw_window_input (gui_current_window);
gui_current_window->completion.position = -1;
gui_current_view->input_buffer_pos);
gui_current_view->input_buffer_pos++;
gui_draw_view_input (gui_current_view);
gui_current_view->completion.position = -1;
break;
}
}
@@ -374,14 +374,14 @@ gui_main_loop ()
if (local_time->tm_min != old_min)
{
old_min = local_time->tm_min;
gui_redraw_window_infobar (gui_current_window);
gui_redraw_view_infobar (gui_current_view);
}
/* second has changed ? => count down time for infobar, if needed */
if (local_time->tm_sec != old_sec)
{
old_sec = local_time->tm_sec;
/* TODO: manage splitted windows! */
/* TODO: manage splited windows! */
if (gui_infobar && gui_infobar->remaining_time > 0)
{
gui_infobar->remaining_time--;
src/gui/gui-common.c
+257 -208
View File
@@ -41,151 +41,200 @@
int gui_ready; /* = 1 if GUI is initialized */
t_gui_window *gui_windows = NULL; /* pointer to first window */
t_gui_window *last_gui_window = NULL; /* pointer to last window */
t_gui_window *gui_current_window = NULL; /* pointer to current window */
t_gui_view *gui_views = NULL; /* pointer to first view */
t_gui_view *last_gui_view = NULL; /* pointer to last view */
t_gui_view *gui_current_view = NULL; /* pointer to current view */
t_gui_infobar *gui_infobar; /* pointer to infobar content */
/*
* gui_window_new: create a new window
* (TODO: add coordinates and size, for splited windows)
*/
t_gui_window *
gui_window_new (void *server, void *channel, int switch_to_window
/*int x, int y, int width, int height*/)
gui_window_new (int x, int y, int width, int height)
{
t_gui_window *new_window;
t_gui_window *window;
if (gui_windows)
if ((window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
{
/* use first window if no server was assigned to this window */
if (!SERVER(gui_windows))
{
if (server)
((t_irc_server *)(server))->window = gui_windows;
if (channel)
((t_irc_channel *)(channel))->window = gui_windows;
SERVER(gui_windows) = server;
CHANNEL(gui_windows) = channel;
return gui_windows;
}
}
if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
{
new_window->is_displayed = 0;
window->win_x = x;
window->win_y = y;
window->win_width = width;
window->win_height = height;
/* assign server and channel to window */
SERVER(new_window) = server;
CHANNEL(new_window) = channel;
/* assign window to server and channel */
if (server && !channel)
SERVER(new_window)->window = new_window;
if (channel)
CHANNEL(new_window)->window = new_window;
window->win_chat_x = 0;
window->win_chat_y = 0;
window->win_chat_width = 0;
window->win_chat_height = 0;
window->win_chat_cursor_x = 0;
window->win_chat_cursor_y = 0;
gui_calculate_pos_size (new_window);
window->win_nick_x = 0;
window->win_nick_y = 0;
window->win_nick_width = 0;
window->win_nick_height = 0;
/* init windows */
gui_window_init_subwindows(new_window);
/* init lines */
new_window->lines = NULL;
new_window->last_line = NULL;
new_window->num_lines = 0;
new_window->first_line_displayed = 1;
new_window->sub_lines = 0;
new_window->line_complete = 1;
new_window->unread_data = 0;
/* init input buffer */
new_window->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_window->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
new_window->input_buffer[0] = '\0';
new_window->input_buffer_size = 0;
new_window->input_buffer_pos = 0;
new_window->input_buffer_1st_display = 0;
/* init completion */
completion_init (&(new_window->completion));
/* init history */
new_window->history = NULL;
new_window->last_history = NULL;
new_window->ptr_history = NULL;
new_window->num_history = 0;
/* switch to new window */
if (switch_to_window)
gui_switch_to_window (new_window);
/* add window to windows queue */
new_window->prev_window = last_gui_window;
if (gui_windows)
last_gui_window->next_window = new_window;
else
gui_windows = new_window;
last_gui_window = new_window;
new_window->next_window = NULL;
/* redraw whole screen */
gui_redraw_window (gui_current_window);
window->win_title = NULL;
window->win_chat = NULL;
window->win_nick = NULL;
window->win_status = NULL;
window->win_infobar = NULL;
window->win_input = NULL;
window->textview_chat = NULL;
window->textbuffer_chat = NULL;
window->texttag_chat = NULL;
window->textview_nicklist = NULL;
window->textbuffer_nicklist = NULL;
}
else
return NULL;
return new_window;
return window;
}
/*
* gui_window_clear: clear window content
* gui_view_new: create a new view in current window
*/
t_gui_view *
gui_view_new (t_gui_window *window, void *server, void *channel, int switch_to_view)
{
t_gui_view *new_view;
if (gui_views)
{
/* use first view if no server was assigned to this view */
if (!SERVER(gui_views))
{
if (server)
((t_irc_server *)(server))->view = gui_views;
if (channel)
((t_irc_channel *)(channel))->view = gui_views;
SERVER(gui_views) = server;
CHANNEL(gui_views) = channel;
return gui_views;
}
}
if ((new_view = (t_gui_view *)(malloc (sizeof (t_gui_view)))))
{
new_view->is_displayed = 0;
/* assign server and channel to view */
SERVER(new_view) = server;
CHANNEL(new_view) = channel;
/* assign view to server and channel */
if (server && !channel)
SERVER(new_view)->view = new_view;
if (channel)
CHANNEL(new_view)->view = new_view;
new_view->window = window;
gui_calculate_pos_size (new_view);
/* init views */
gui_view_init_subviews(new_view);
/* init lines */
new_view->lines = NULL;
new_view->last_line = NULL;
new_view->num_lines = 0;
new_view->first_line_displayed = 1;
new_view->sub_lines = 0;
new_view->line_complete = 1;
new_view->unread_data = 0;
/* init input buffer */
new_view->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_view->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
new_view->input_buffer[0] = '\0';
new_view->input_buffer_size = 0;
new_view->input_buffer_pos = 0;
new_view->input_buffer_1st_display = 0;
/* init completion */
completion_init (&(new_view->completion));
/* init history */
new_view->history = NULL;
new_view->last_history = NULL;
new_view->ptr_history = NULL;
new_view->num_history = 0;
/* switch to new view */
if (switch_to_view)
gui_switch_to_view (new_view);
/* add view to views queue */
new_view->prev_view = last_gui_view;
if (gui_views)
last_gui_view->next_view = new_view;
else
gui_views = new_view;
last_gui_view = new_view;
new_view->next_view = NULL;
/* redraw whole screen */
/* TODO: manage splited windows */
gui_redraw_view (gui_current_view);
}
else
return NULL;
return new_view;
}
/*
* gui_view_clear: clear view content
*/
void
gui_window_clear (t_gui_window *window)
gui_view_clear (t_gui_view *view)
{
t_gui_line *ptr_line;
t_gui_message *ptr_message;
while (window->lines)
while (view->lines)
{
ptr_line = window->lines->next_line;
while (window->lines->messages)
ptr_line = view->lines->next_line;
while (view->lines->messages)
{
ptr_message = window->lines->messages->next_message;
if (window->lines->messages->message)
free (window->lines->messages->message);
free (window->lines->messages);
window->lines->messages = ptr_message;
ptr_message = view->lines->messages->next_message;
if (view->lines->messages->message)
free (view->lines->messages->message);
free (view->lines->messages);
view->lines->messages = ptr_message;
}
free (window->lines);
window->lines = ptr_line;
free (view->lines);
view->lines = ptr_line;
}
window->lines = NULL;
window->last_line = NULL;
window->num_lines = 0;
window->first_line_displayed = 1;
window->sub_lines = 0;
window->line_complete = 1;
window->unread_data = 0;
view->lines = NULL;
view->last_line = NULL;
view->num_lines = 0;
view->first_line_displayed = 1;
view->sub_lines = 0;
view->line_complete = 1;
view->unread_data = 0;
if (window == gui_current_window)
gui_redraw_window_chat (window);
if (view == gui_current_view)
gui_redraw_view_chat (view);
}
/*
* gui_window_clear_all: clear all windows content
* gui_view_clear_all: clear all views content
*/
void
gui_window_clear_all ()
gui_view_clear_all ()
{
t_gui_window *ptr_win;
t_gui_view *ptr_view;
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
gui_window_clear (ptr_win);
for (ptr_view = gui_views; ptr_view; ptr_view = ptr_view->next_view)
gui_view_clear (ptr_view);
}
/*
@@ -215,8 +264,8 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
ptr_infobar->next_infobar = gui_infobar;
gui_infobar = ptr_infobar;
/* TODO: manage splitted windows! */
gui_redraw_window_infobar (gui_current_window);
/* TODO: manage splited windows! */
gui_redraw_view_infobar (gui_current_view);
}
else
wee_log_printf (_("%s not enough memory for infobar message\n"),
@@ -239,13 +288,13 @@ gui_infobar_remove ()
free (gui_infobar->text);
free (gui_infobar);
gui_infobar = new_infobar;
/* TODO: manage splitted windows! */
gui_redraw_window_infobar (gui_current_window);
/* TODO: manage splited windows! */
gui_redraw_view_infobar (gui_current_view);
}
}
/*
* gui_line_free: delete a line from a window
* gui_line_free: delete a line from a view
*/
void
@@ -265,57 +314,57 @@ gui_line_free (t_gui_line *line)
}
/*
* gui_window_free: delete a window
* gui_view_free: delete a view
*/
void
gui_window_free (t_gui_window *window)
gui_view_free (t_gui_view *view)
{
t_gui_line *ptr_line;
int create_new;
create_new = (window->server || window->channel);
create_new = (view->server || view->channel);
/* TODO: manage splitted windows! */
if ((window == gui_current_window) &&
((window->next_window) || (window->prev_window)))
gui_switch_to_previous_window ();
/* TODO: manage splited windows! */
if ((view == gui_current_view) &&
((view->next_view) || (view->prev_view)))
gui_switch_to_previous_view ();
/* free lines and messages */
while (window->lines)
while (view->lines)
{
ptr_line = window->lines->next_line;
gui_line_free (window->lines);
window->lines = ptr_line;
ptr_line = view->lines->next_line;
gui_line_free (view->lines);
view->lines = ptr_line;
}
if (window->input_buffer)
free (window->input_buffer);
if (view->input_buffer)
free (view->input_buffer);
completion_free (&(window->completion));
completion_free (&(view->completion));
/* remove window from windows list */
if (window->prev_window)
window->prev_window->next_window = window->next_window;
if (window->next_window)
window->next_window->prev_window = window->prev_window;
if (gui_windows == window)
gui_windows = window->next_window;
if (last_gui_window == window)
last_gui_window = window->prev_window;
/* remove view from views list */
if (view->prev_view)
view->prev_view->next_view = view->next_view;
if (view->next_view)
view->next_view->prev_view = view->prev_view;
if (gui_views == view)
gui_views = view->next_view;
if (last_gui_view == view)
last_gui_view = view->prev_view;
free (window);
free (view);
/* always at least one window */
if (!gui_windows && create_new)
(void) gui_window_new (NULL, NULL, 1);
/* always at least one view */
if (!gui_views && create_new)
(void) gui_view_new (gui_windows, NULL, NULL, 1);
}
/*
* gui_new_line: create new line for a window
* gui_new_line: create new line for a view
*/
t_gui_line *
gui_new_line (t_gui_window *window)
gui_new_line (t_gui_view *view)
{
t_gui_line *new_line, *ptr_line;
@@ -326,14 +375,14 @@ gui_new_line (t_gui_window *window)
new_line->line_with_message = 0;
new_line->messages = NULL;
new_line->last_message = NULL;
if (!window->lines)
window->lines = new_line;
if (!view->lines)
view->lines = new_line;
else
window->last_line->next_line = new_line;
new_line->prev_line = window->last_line;
view->last_line->next_line = new_line;
new_line->prev_line = view->last_line;
new_line->next_line = NULL;
window->last_line = new_line;
window->num_lines++;
view->last_line = new_line;
view->num_lines++;
}
else
{
@@ -343,40 +392,40 @@ gui_new_line (t_gui_window *window)
/* remove one line if necessary */
if ((cfg_history_max_lines > 0)
&& (window->num_lines > cfg_history_max_lines))
&& (view->num_lines > cfg_history_max_lines))
{
if (window->last_line == window->lines)
window->last_line = NULL;
ptr_line = window->lines->next_line;
gui_line_free (window->lines);
window->lines = ptr_line;
if (view->last_line == view->lines)
view->last_line = NULL;
ptr_line = view->lines->next_line;
gui_line_free (view->lines);
view->lines = ptr_line;
ptr_line->prev_line = NULL;
window->num_lines--;
if (window->first_line_displayed)
gui_redraw_window_chat (window);
view->num_lines--;
if (view->first_line_displayed)
gui_redraw_view_chat (view);
}
return new_line;
}
/*
* gui_new_message: create a new message for last line of window
* gui_new_message: create a new message for last line of a view
*/
t_gui_message *
gui_new_message (t_gui_window *window)
gui_new_message (t_gui_view *view)
{
t_gui_message *new_message;
if ((new_message = (t_gui_message *) malloc (sizeof (struct t_gui_message))))
{
if (!window->last_line->messages)
window->last_line->messages = new_message;
if (!view->last_line->messages)
view->last_line->messages = new_message;
else
window->last_line->last_message->next_message = new_message;
new_message->prev_message = window->last_line->last_message;
view->last_line->last_message->next_message = new_message;
new_message->prev_message = view->last_line->last_message;
new_message->next_message = NULL;
window->last_line->last_message = new_message;
view->last_line->last_message = new_message;
}
else
{
@@ -392,16 +441,16 @@ gui_new_message (t_gui_window *window)
*/
void
gui_optimize_input_buffer_size (t_gui_window *window)
gui_optimize_input_buffer_size (t_gui_view *view)
{
int optimal_size;
optimal_size = ((window->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
optimal_size = ((view->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
INPUT_BUFFER_BLOCK_SIZE) + INPUT_BUFFER_BLOCK_SIZE;
if (window->input_buffer_alloc != optimal_size)
if (view->input_buffer_alloc != optimal_size)
{
window->input_buffer_alloc = optimal_size;
window->input_buffer = realloc (window->input_buffer, optimal_size);
view->input_buffer_alloc = optimal_size;
view->input_buffer = realloc (view->input_buffer, optimal_size);
}
}
@@ -414,21 +463,21 @@ gui_delete_previous_word ()
{
int i, j, num_char_deleted, num_char_end;
if (gui_current_window->input_buffer_pos > 0)
if (gui_current_view->input_buffer_pos > 0)
{
i = gui_current_window->input_buffer_pos - 1;
i = gui_current_view->input_buffer_pos - 1;
while ((i >= 0) &&
(gui_current_window->input_buffer[i] == ' '))
(gui_current_view->input_buffer[i] == ' '))
i--;
if (i >= 0)
{
while ((i >= 0) &&
(gui_current_window->input_buffer[i] != ' '))
(gui_current_view->input_buffer[i] != ' '))
i--;
if (i >= 0)
{
while ((i >= 0) &&
(gui_current_window->input_buffer[i] == ' '))
(gui_current_view->input_buffer[i] == ' '))
i--;
}
}
@@ -436,20 +485,20 @@ gui_delete_previous_word ()
if (i >= 0)
i++;
i++;
num_char_deleted = gui_current_window->input_buffer_pos - i;
num_char_end = gui_current_window->input_buffer_size -
gui_current_window->input_buffer_pos;
num_char_deleted = gui_current_view->input_buffer_pos - i;
num_char_end = gui_current_view->input_buffer_size -
gui_current_view->input_buffer_pos;
for (j = 0; j < num_char_end; j++)
gui_current_window->input_buffer[i + j] =
gui_current_window->input_buffer[gui_current_window->input_buffer_pos + j];
gui_current_view->input_buffer[i + j] =
gui_current_view->input_buffer[gui_current_view->input_buffer_pos + j];
gui_current_window->input_buffer_size -= num_char_deleted;
gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
gui_current_window->input_buffer_pos = i;
gui_draw_window_input (gui_current_window);
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->completion.position = -1;
gui_current_view->input_buffer_size -= num_char_deleted;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_current_view->input_buffer_pos = i;
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
}
}
@@ -462,22 +511,22 @@ gui_move_previous_word ()
{
int i;
if (gui_current_window->input_buffer_pos > 0)
if (gui_current_view->input_buffer_pos > 0)
{
i = gui_current_window->input_buffer_pos - 1;
i = gui_current_view->input_buffer_pos - 1;
while ((i >= 0) &&
(gui_current_window->input_buffer[i] == ' '))
(gui_current_view->input_buffer[i] == ' '))
i--;
if (i < 0)
gui_current_window->input_buffer_pos = 0;
gui_current_view->input_buffer_pos = 0;
else
{
while ((i >= 0) &&
(gui_current_window->input_buffer[i] != ' '))
(gui_current_view->input_buffer[i] != ' '))
i--;
gui_current_window->input_buffer_pos = i + 1;
gui_current_view->input_buffer_pos = i + 1;
}
gui_draw_window_input (gui_current_window);
gui_draw_view_input (gui_current_view);
}
}
@@ -490,28 +539,28 @@ gui_move_next_word ()
{
int i;
if (gui_current_window->input_buffer_pos <
gui_current_window->input_buffer_size + 1)
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size + 1)
{
i = gui_current_window->input_buffer_pos;
while ((i <= gui_current_window->input_buffer_size) &&
(gui_current_window->input_buffer[i] == ' '))
i = gui_current_view->input_buffer_pos;
while ((i <= gui_current_view->input_buffer_size) &&
(gui_current_view->input_buffer[i] == ' '))
i++;
if (i > gui_current_window->input_buffer_size)
gui_current_window->input_buffer_pos = i - 1;
if (i > gui_current_view->input_buffer_size)
gui_current_view->input_buffer_pos = i - 1;
else
{
while ((i <= gui_current_window->input_buffer_size) &&
(gui_current_window->input_buffer[i] != ' '))
while ((i <= gui_current_view->input_buffer_size) &&
(gui_current_view->input_buffer[i] != ' '))
i++;
if (i > gui_current_window->input_buffer_size)
gui_current_window->input_buffer_pos =
gui_current_window->input_buffer_size;
if (i > gui_current_view->input_buffer_size)
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
else
gui_current_window->input_buffer_pos = i;
gui_current_view->input_buffer_pos = i;
}
gui_draw_window_input (gui_current_window);
gui_draw_view_input (gui_current_view);
}
}
@@ -527,17 +576,17 @@ gui_buffer_insert_string (char *string, int pos)
length = strlen (string);
/* increase buffer size */
gui_current_window->input_buffer_size += length;
gui_optimize_input_buffer_size (gui_current_window);
gui_current_window->input_buffer[gui_current_window->input_buffer_size] = '\0';
gui_current_view->input_buffer_size += length;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
/* move end of string to the right */
start = pos + length;
end = gui_current_window->input_buffer_size - 1;
end = gui_current_view->input_buffer_size - 1;
for (i = end; i >= start; i--)
gui_current_window->input_buffer[i] =
gui_current_window->input_buffer[i - length];
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i - length];
/* insert new string */
strncpy (gui_current_window->input_buffer + pos, string, length);
strncpy (gui_current_view->input_buffer + pos, string, length);
}
src/gui/gui.h
+59 -47
View File
@@ -59,23 +59,23 @@
#define COLOR_WIN_NICK_LAST 38
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define SERVER(window) ((t_irc_server *)(window->server))
#define CHANNEL(window) ((t_irc_channel *)(window->channel))
#define SERVER(view) ((t_irc_server *)(view->server))
#define CHANNEL(view) ((t_irc_channel *)(view->channel))
#define WIN_IS_SERVER(window) (SERVER(window) && !CHANNEL(window))
#define WIN_IS_CHANNEL(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_CHANNEL))
#define WIN_IS_PRIVATE(window) (CHANNEL(window) && (CHANNEL(window)->type == CHAT_PRIVATE))
#define VIEW_IS_SERVER(view) (SERVER(view) && !CHANNEL(view))
#define VIEW_IS_CHANNEL(view) (CHANNEL(view) && (CHANNEL(view)->type == CHAT_CHANNEL))
#define VIEW_IS_PRIVATE(view) (CHANNEL(view) && (CHANNEL(view)->type == CHAT_PRIVATE))
#define MSG_TYPE_TIME 0
#define MSG_TYPE_NICK 1
#define MSG_TYPE_INFO 2
#define MSG_TYPE_MSG 3
#define gui_printf_color(window, color, fmt, argz...) \
gui_printf_color_type(window, MSG_TYPE_INFO, color, fmt, ##argz)
#define gui_printf_color(view, color, fmt, argz...) \
gui_printf_color_type(view, MSG_TYPE_INFO, color, fmt, ##argz)
#define gui_printf(window, fmt, argz...) \
gui_printf_color_type(window, MSG_TYPE_INFO, -1, fmt, ##argz)
#define gui_printf(view, fmt, argz...) \
gui_printf_color_type(view, MSG_TYPE_INFO, -1, fmt, ##argz)
typedef struct t_gui_message t_gui_message;
@@ -125,12 +125,6 @@ typedef struct t_gui_window t_gui_window;
struct t_gui_window
{
int is_displayed; /* = 1 if window is displayed */
/* server/channel */
void *server; /* window's server */
void *channel; /* window's channel */
/* global position & size */
int win_x, win_y; /* position of window */
int win_width, win_height; /* window geometry */
@@ -149,7 +143,7 @@ struct t_gui_window
/* windows for Curses GUI */
void *win_title; /* title window */
void *win_chat; /* chat window (exemple: channel) */
void *win_chat; /* chat window (example: channel) */
void *win_nick; /* nick window */
void *win_status; /* status window */
void *win_infobar; /* info bar window */
@@ -165,6 +159,22 @@ struct t_gui_window
/* windows for Qt GUI */
/* TODO: declare Qt window */
t_gui_window *prev_window; /* link to previous window */
t_gui_window *next_window; /* link to next window */
};
typedef struct t_gui_view t_gui_view;
struct t_gui_view
{
int is_displayed; /* = 1 if view is displayed */
/* server/channel */
void *server; /* view's server */
void *channel; /* view's channel */
t_gui_window *window; /* Curses or Gtk window */
/* chat content (lines, line is composed by many messages) */
t_gui_line *lines; /* lines of chat window */
t_gui_line *last_line; /* last line of chat window */
@@ -191,29 +201,31 @@ struct t_gui_window
int num_history; /* number of commands in history */
/* link to next window */
t_gui_window *prev_window; /* link to previous window */
t_gui_window *next_window; /* link to next window */
t_gui_view *prev_view; /* link to previous view */
t_gui_view *next_view; /* link to next view */
};
/* variables */
extern int gui_ready;
extern t_gui_window *gui_windows;
extern t_gui_window *last_gui_window;
extern t_gui_window *gui_current_window;
extern t_gui_view *gui_views;
extern t_gui_view *last_gui_view;
extern t_gui_view *gui_current_view;
extern t_gui_infobar *gui_infobar;
/* prototypes */
/* GUI independent functions */
extern t_gui_window *gui_window_new (/*@null@*/ void *, /*@null@*/ void *, int /*int, int, int, int*/); /* TODO: add coordinates and size */
extern void gui_window_clear (t_gui_window *);
extern void gui_window_clear_all ();
extern t_gui_window *gui_window_new (int, int, int, int);
extern t_gui_view *gui_view_new (t_gui_window *, void *, void *, int);
extern void gui_view_clear (t_gui_view *);
extern void gui_view_clear_all ();
extern void gui_infobar_printf (int, int, char *, ...);
extern void gui_infobar_remove ();
extern t_gui_line *gui_new_line (t_gui_window *);
extern t_gui_message *gui_new_message (t_gui_window *);
extern void gui_optimize_input_buffer_size (t_gui_window *);
extern t_gui_line *gui_new_line (t_gui_view *);
extern t_gui_message *gui_new_message (t_gui_view *);
extern void gui_optimize_input_buffer_size (t_gui_view *);
extern void gui_delete_previous_word ();
extern void gui_move_previous_word ();
extern void gui_move_next_word ();
@@ -222,34 +234,34 @@ extern void gui_buffer_insert_string (char *, int);
extern int gui_assign_color (int *, char *);
extern int gui_get_color_by_name (char *);
extern char *gui_get_color_by_value (int);
extern int gui_window_has_nicklist (t_gui_window *);
extern void gui_calculate_pos_size (t_gui_window *);
extern void gui_draw_window_title (t_gui_window *);
extern void gui_redraw_window_title (t_gui_window *);
extern void gui_draw_window_chat (t_gui_window *);
extern void gui_redraw_window_chat (t_gui_window *);
extern void gui_draw_window_nick (t_gui_window *);
extern void gui_redraw_window_nick (t_gui_window *);
extern void gui_draw_window_status (t_gui_window *);
extern void gui_redraw_window_status (t_gui_window *);
extern void gui_draw_window_infobar (t_gui_window *);
extern void gui_redraw_window_infobar (t_gui_window *);
extern void gui_draw_window_input (t_gui_window *);
extern void gui_redraw_window_input (t_gui_window *);
extern void gui_redraw_window (t_gui_window *);
extern void gui_switch_to_window (t_gui_window *);
extern void gui_switch_to_previous_window ();
extern void gui_switch_to_next_window ();
extern int gui_view_has_nicklist (t_gui_view *);
extern void gui_calculate_pos_size (t_gui_view *);
extern void gui_draw_view_title (t_gui_view *);
extern void gui_redraw_view_title (t_gui_view *);
extern void gui_draw_view_chat (t_gui_view *);
extern void gui_redraw_view_chat (t_gui_view *);
extern void gui_draw_view_nick (t_gui_view *);
extern void gui_redraw_view_nick (t_gui_view *);
extern void gui_draw_view_status (t_gui_view *);
extern void gui_redraw_view_status (t_gui_view *);
extern void gui_draw_view_infobar (t_gui_view *);
extern void gui_redraw_view_infobar (t_gui_view *);
extern void gui_draw_view_input (t_gui_view *);
extern void gui_redraw_view_input (t_gui_view *);
extern void gui_redraw_view (t_gui_view *);
extern void gui_switch_to_view (t_gui_view *);
extern void gui_switch_to_previous_view ();
extern void gui_switch_to_next_view ();
extern void gui_move_page_up ();
extern void gui_move_page_down ();
extern void gui_window_init_subwindows (t_gui_window *);
extern void gui_view_init_subviews (t_gui_view *);
extern void gui_pre_init (int *, char **[]);
extern void gui_init_colors ();
extern void gui_set_window_title ();
extern void gui_init ();
extern void gui_window_free (t_gui_window *);
extern void gui_view_free (t_gui_view *);
extern void gui_end ();
extern void gui_printf_color_type (/*@null@*/ t_gui_window *, int, int, char *, ...);
extern void gui_printf_color_type (/*@null@*/ t_gui_view *, int, int, char *, ...);
extern void gui_main_loop ();
#endif /* gui.h */