diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/curses/gui-curses-main.c | 3 | ||||
-rw-r--r-- | src/gui/curses/gui-curses.h | 3 | ||||
-rw-r--r-- | src/gui/gtk/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/gui/gtk/Makefile.am | 1 | ||||
-rw-r--r-- | src/gui/gtk/gui-gtk-term.c | 37 | ||||
-rw-r--r-- | src/gui/gui-main.h | 3 |
6 files changed, 44 insertions, 4 deletions
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c index 33e1143bf..d95c3f56a 100644 --- a/src/gui/curses/gui-curses-main.c +++ b/src/gui/curses/gui-curses-main.c @@ -92,7 +92,8 @@ gui_main_init () initscr (); - gui_term_set_eat_newline_glitch (0); + if (CONFIG_BOOLEAN(config_look_eat_newline_glitch)) + gui_term_set_eat_newline_glitch (0); curs_set (1); noecho (); diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h index 97b663f3b..7c5033912 100644 --- a/src/gui/curses/gui-curses.h +++ b/src/gui/curses/gui-curses.h @@ -82,9 +82,6 @@ extern void gui_chat_calculate_line_diff (struct t_gui_window *window, extern void gui_keyboard_default_bindings (); extern int gui_keyboard_read_cb (void *data, int fd); -/* terminal functions */ -extern void gui_term_set_eat_newline_glitch (int value); - /* window functions */ extern void gui_window_read_terminal_size (); extern void gui_window_redraw_buffer (struct t_gui_buffer *buffer); diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt index 59d418361..817c3e715 100644 --- a/src/gui/gtk/CMakeLists.txt +++ b/src/gui/gtk/CMakeLists.txt @@ -25,6 +25,7 @@ gui-gtk-chat.c gui-gtk-color.c gui-gtk-keyboard.c gui-gtk-main.c +gui-gtk-term.c gui-gtk-window.c) SET(EXECUTABLE weechat-gtk) diff --git a/src/gui/gtk/Makefile.am b/src/gui/gtk/Makefile.am index a2ffef971..4bd2fa16c 100644 --- a/src/gui/gtk/Makefile.am +++ b/src/gui/gtk/Makefile.am @@ -37,6 +37,7 @@ weechat_gtk_SOURCES = gui-gtk-bar-window.c \ gui-gtk-color.c \ gui-gtk-keyboard.c \ gui-gtk-main.c \ + gui-gtk-term.c \ gui-gtk-window.c \ gui-gtk.h diff --git a/src/gui/gtk/gui-gtk-term.c b/src/gui/gtk/gui-gtk-term.c new file mode 100644 index 000000000..aa510cf87 --- /dev/null +++ b/src/gui/gtk/gui-gtk-term.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2011 Sebastien Helleu <flashcode@flashtux.org> + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * WeeChat is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WeeChat. If not, see <http://www.gnu.org/licenses/>. + */ + +/* + * gui-gtk-term.c: terminal functions for Gtk GUI + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/* + * gui_term_set_eat_newline_glitch: not used in Gtk GUI + */ + +void +gui_term_set_eat_newline_glitch (int value) +{ + /* make C compiler happy */ + (void) value; +} diff --git a/src/gui/gui-main.h b/src/gui/gui-main.h index 387134c60..887d28b8a 100644 --- a/src/gui/gui-main.h +++ b/src/gui/gui-main.h @@ -27,4 +27,7 @@ extern void gui_main_pre_init (int *argc, char **argv[]); extern void gui_main_init (); extern void gui_main_end (int clean_exit); +/* terminal functions (GUI dependent) */ +extern void gui_term_set_eat_newline_glitch (int value); + #endif /* __WEECHAT_GUI_MAIN_H */ |