diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/curses/gui-curses-input.c | 54 | ||||
-rw-r--r-- | src/gui/gui-buffer.h | 2 | ||||
-rw-r--r-- | src/gui/gui-window.c | 7 | ||||
-rw-r--r-- | src/gui/gui-window.h | 5 |
4 files changed, 0 insertions, 68 deletions
diff --git a/src/gui/curses/gui-curses-input.c b/src/gui/curses/gui-curses-input.c index dd027e2a3..be0a79da5 100644 --- a/src/gui/curses/gui-curses-input.c +++ b/src/gui/curses/gui-curses-input.c @@ -279,7 +279,6 @@ gui_input_draw (struct t_gui_buffer *buffer, int erase) struct t_gui_window *ptr_win; char format[32]; int prompt_length, display_prompt, offset_cursor; - /*t_irc_dcc *dcc_selected;*/ if (!gui_ok) return; @@ -365,59 +364,6 @@ gui_input_draw (struct t_gui_buffer *buffer, int erase) move (ptr_win->win_input_y, ptr_win->win_input_x + ptr_win->win_input_cursor_x); } - /* - case GUI_BUFFER_TYPE_DCC: - dcc_selected = (ptr_win->dcc_selected) ? (t_irc_dcc *) ptr_win->dcc_selected : irc_dcc_list; - wmove (GUI_CURSES(ptr_win)->win_input, 0, 0); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_input, - GUI_COLOR_WIN_INPUT_ACTIONS); - if (dcc_selected) - { - switch (dcc_selected->status) - { - case IRC_DCC_WAITING: - if (IRC_DCC_IS_RECV(dcc_selected->type)) - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [A] Accept")); - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [C] Cancel")); - break; - case IRC_DCC_CONNECTING: - case IRC_DCC_ACTIVE: - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [C] Cancel")); - break; - case IRC_DCC_DONE: - case IRC_DCC_FAILED: - case IRC_DCC_ABORTED: - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [R] Remove")); - break; - } - } - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [P] Purge old DCC")); - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [Q] Close DCC view")); - wclrtoeol (GUI_CURSES(ptr_win)->win_input); - ptr_win->win_input_cursor_x = 0; - if (ptr_win == gui_current_window) - move (ptr_win->win_input_y, ptr_win->win_input_x); - break; - case GUI_BUFFER_TYPE_RAW_DATA: - wmove (GUI_CURSES(ptr_win)->win_input, 0, 0); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_input, - GUI_COLOR_WIN_INPUT_ACTIONS); - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [C] Clear buffer")); - gui_window_wprintw (GUI_CURSES(ptr_win)->win_input, - _(" [Q] Close raw data view")); - wclrtoeol (GUI_CURSES(ptr_win)->win_input); - ptr_win->win_input_cursor_x = 0; - if (ptr_win == gui_current_window) - move (ptr_win->win_input_y, ptr_win->win_input_x); - break; - }*/ } wrefresh (GUI_CURSES(ptr_win)->win_input); refresh (); diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 4951b8df3..121cd185e 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -190,14 +190,12 @@ extern struct t_gui_window *gui_buffer_find_window (struct t_gui_buffer *buffer) extern int gui_buffer_is_scrolled (struct t_gui_buffer *buffer); extern int gui_buffer_match_category_name (struct t_gui_buffer *buffer, char *mask, int case_sensitive); -extern struct t_gui_buffer *gui_buffer_get_dcc (struct t_gui_window *window); extern void gui_buffer_clear (struct t_gui_buffer *buffer); extern void gui_buffer_clear_all (); extern void gui_buffer_close (struct t_gui_buffer *buffer, int switch_to_another); extern void gui_buffer_switch_previous (struct t_gui_window *window); extern void gui_buffer_switch_next (struct t_gui_window *window); -extern void gui_buffer_switch_dcc (struct t_gui_window *window); extern void gui_buffer_switch_by_number (struct t_gui_window *window, int number); extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number); diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index 78e8a461f..adb7202e5 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -249,10 +249,6 @@ gui_window_new (struct t_gui_window *parent, int x, int y, int width, int height new_window->refresh_needed = 0; - new_window->dcc_first = NULL; - new_window->dcc_selected = NULL; - new_window->dcc_last_displayed = NULL; - new_window->buffer = NULL; new_window->first_line_displayed = 0; @@ -942,9 +938,6 @@ gui_window_print_log () log_printf (" win_input_width . . : %d", ptr_window->win_input_width); log_printf (" win_input_height. . : %d", ptr_window->win_input_height); log_printf (" win_input_cursor_x. : %d", ptr_window->win_input_cursor_x); - log_printf (" dcc_first . . . . . : 0x%x", ptr_window->dcc_first); - log_printf (" dcc_selected. . . . : 0x%x", ptr_window->dcc_selected); - log_printf (" dcc_last_displayed. : 0x%x", ptr_window->dcc_last_displayed); log_printf (" buffer. . . . . . . : 0x%x", ptr_window->buffer); log_printf (" first_line_displayed: %d", ptr_window->first_line_displayed); log_printf (" start_line. . . . . : 0x%x", ptr_window->start_line); diff --git a/src/gui/gui-window.h b/src/gui/gui-window.h index 9215f748b..f5d0564e5 100644 --- a/src/gui/gui-window.h +++ b/src/gui/gui-window.h @@ -83,11 +83,6 @@ struct t_gui_window /* GUI specific objects */ void *gui_objects; /* pointer to a GUI specific struct */ - /* DCC */ - void *dcc_first; /* first dcc displayed */ - void *dcc_selected; /* selected dcc */ - void *dcc_last_displayed; /* last dcc displayed (for scroll) */ - struct t_gui_buffer *buffer; /* buffer currently displayed */ int first_line_displayed; /* = 1 if first line is displayed */ |