diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/gui/curses/gui-input.c | 29 | ||||
| -rw-r--r-- | weechat/ChangeLog | 1 | ||||
| -rw-r--r-- | weechat/src/gui/curses/gui-input.c | 29 |
4 files changed, 44 insertions, 16 deletions
@@ -5,6 +5,7 @@ ChangeLog - 2006-03-21 Version 0.1.9 (under dev!): + * fixed high CPU usage when running under a screen that has been killed * aliases are executed before WeeChat/IRC commands, /builtin command added * added /cycle command, /part command does close buffer any more (use /buffer close (or alias /close) to part and close buffer diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c index 225058c25..cd4215629 100644 --- a/src/gui/curses/gui-input.c +++ b/src/gui/curses/gui-input.c @@ -317,7 +317,7 @@ gui_main_loop () char text_time[1024]; time_t new_time; struct tm *local_time; - + quit_weechat = 0; new_time = time (NULL); @@ -397,14 +397,31 @@ gui_main_loop () plugin_timer_handler_exec (); } + /* read keyboard */ + FD_ZERO (&read_fd); + timeout.tv_sec = 0; + timeout.tv_usec = 8000; FD_SET (STDIN_FILENO, &read_fd); - if (weechat_fifo != -1) - FD_SET (weechat_fifo, &read_fd); + + if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout) > 0) + { + if (FD_ISSET (STDIN_FILENO, &read_fd)) + { + gui_input_read (); + } + } + + /* read sockets (servers, child process when connecting, FIFO pipe) */ + + FD_ZERO (&read_fd); timeout.tv_sec = 0; - timeout.tv_usec = 10000; + timeout.tv_usec = 2000; + + if (weechat_fifo != -1) + FD_SET (weechat_fifo, &read_fd); for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) @@ -456,10 +473,6 @@ gui_main_loop () if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout) > 0) { - if (FD_ISSET (STDIN_FILENO, &read_fd)) - { - gui_input_read (); - } if ((weechat_fifo != -1) && (FD_ISSET (weechat_fifo, &read_fd))) { fifo_read (); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 6a98ece67..aa11dc45d 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -5,6 +5,7 @@ ChangeLog - 2006-03-21 Version 0.1.9 (under dev!): + * fixed high CPU usage when running under a screen that has been killed * aliases are executed before WeeChat/IRC commands, /builtin command added * added /cycle command, /part command does close buffer any more (use /buffer close (or alias /close) to part and close buffer diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c index 225058c25..cd4215629 100644 --- a/weechat/src/gui/curses/gui-input.c +++ b/weechat/src/gui/curses/gui-input.c @@ -317,7 +317,7 @@ gui_main_loop () char text_time[1024]; time_t new_time; struct tm *local_time; - + quit_weechat = 0; new_time = time (NULL); @@ -397,14 +397,31 @@ gui_main_loop () plugin_timer_handler_exec (); } + /* read keyboard */ + FD_ZERO (&read_fd); + timeout.tv_sec = 0; + timeout.tv_usec = 8000; FD_SET (STDIN_FILENO, &read_fd); - if (weechat_fifo != -1) - FD_SET (weechat_fifo, &read_fd); + + if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout) > 0) + { + if (FD_ISSET (STDIN_FILENO, &read_fd)) + { + gui_input_read (); + } + } + + /* read sockets (servers, child process when connecting, FIFO pipe) */ + + FD_ZERO (&read_fd); timeout.tv_sec = 0; - timeout.tv_usec = 10000; + timeout.tv_usec = 2000; + + if (weechat_fifo != -1) + FD_SET (weechat_fifo, &read_fd); for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) @@ -456,10 +473,6 @@ gui_main_loop () if (select (FD_SETSIZE, &read_fd, NULL, NULL, &timeout) > 0) { - if (FD_ISSET (STDIN_FILENO, &read_fd)) - { - gui_input_read (); - } if ((weechat_fifo != -1) && (FD_ISSET (weechat_fifo, &read_fd))) { fifo_read (); |