mirror of
https://github.com/profanity-im/profanity.git
synced 2024-10-13 20:13:38 -04:00
Merge pull request #1943 from H3rnand3zzz/gmainloop
Use Gmainloop as a main loop to increase performance
This commit is contained in:
commit
609fde0998
@ -130,6 +130,7 @@ unittest_sources = \
|
|||||||
tests/unittests/xmpp/stub_xmpp.c \
|
tests/unittests/xmpp/stub_xmpp.c \
|
||||||
tests/unittests/xmpp/stub_message.c \
|
tests/unittests/xmpp/stub_message.c \
|
||||||
tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \
|
tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \
|
||||||
|
tests/unittests/ui/stub_inputwin.c tests/unittests/ui/stub_inputwin.h \
|
||||||
tests/unittests/ui/stub_vcardwin.c \
|
tests/unittests/ui/stub_vcardwin.c \
|
||||||
tests/unittests/log/stub_log.c \
|
tests/unittests/log/stub_log.c \
|
||||||
tests/unittests/chatlog/stub_chatlog.c \
|
tests/unittests/chatlog/stub_chatlog.c \
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
@ -60,6 +61,7 @@
|
|||||||
#include "command/cmd_defs.h"
|
#include "command/cmd_defs.h"
|
||||||
#include "plugins/plugins.h"
|
#include "plugins/plugins.h"
|
||||||
#include "event/client_events.h"
|
#include "event/client_events.h"
|
||||||
|
#include "ui/inputwin.h"
|
||||||
#include "ui/ui.h"
|
#include "ui/ui.h"
|
||||||
#include "ui/window_list.h"
|
#include "ui/window_list.h"
|
||||||
#include "xmpp/resource.h"
|
#include "xmpp/resource.h"
|
||||||
@ -86,15 +88,15 @@
|
|||||||
static void _init(char* log_level, char* config_file, char* log_file, char* theme_name);
|
static void _init(char* log_level, char* config_file, char* log_file, char* theme_name);
|
||||||
static void _shutdown(void);
|
static void _shutdown(void);
|
||||||
static void _connect_default(const char* const account);
|
static void _connect_default(const char* const account);
|
||||||
|
static gboolean _main_update(gpointer data);
|
||||||
|
|
||||||
pthread_mutex_t lock;
|
pthread_mutex_t lock;
|
||||||
static gboolean force_quit = FALSE;
|
static gboolean force_quit = FALSE;
|
||||||
|
GMainLoop* mainloop = NULL;
|
||||||
|
|
||||||
void
|
void
|
||||||
prof_run(char* log_level, char* account_name, char* config_file, char* log_file, char* theme_name)
|
prof_run(char* log_level, char* account_name, char* config_file, char* log_file, char* theme_name)
|
||||||
{
|
{
|
||||||
gboolean cont = TRUE;
|
|
||||||
|
|
||||||
_init(log_level, config_file, log_file, theme_name);
|
_init(log_level, config_file, log_file, theme_name);
|
||||||
plugins_on_start();
|
plugins_on_start();
|
||||||
_connect_default(account_name);
|
_connect_default(account_name);
|
||||||
@ -105,33 +107,10 @@ prof_run(char* log_level, char* account_name, char* config_file, char* log_file,
|
|||||||
|
|
||||||
session_init_activity();
|
session_init_activity();
|
||||||
|
|
||||||
char* line = NULL;
|
mainloop = g_main_loop_new(NULL, TRUE);
|
||||||
while (cont && !force_quit) {
|
g_timeout_add(1000 / 60, _main_update, NULL);
|
||||||
log_stderr_handler();
|
inp_add_watch();
|
||||||
session_check_autoaway();
|
g_main_loop_run(mainloop);
|
||||||
|
|
||||||
line = inp_readline();
|
|
||||||
if (line) {
|
|
||||||
ProfWin* window = wins_get_current();
|
|
||||||
cont = cmd_process_input(window, line);
|
|
||||||
free(line);
|
|
||||||
line = NULL;
|
|
||||||
} else {
|
|
||||||
cont = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBOTR
|
|
||||||
otr_poll();
|
|
||||||
#endif
|
|
||||||
plugins_run_timed();
|
|
||||||
notify_remind();
|
|
||||||
session_process_events();
|
|
||||||
iq_autoping_check();
|
|
||||||
ui_update();
|
|
||||||
#ifdef HAVE_GTK
|
|
||||||
tray_update();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -140,6 +119,29 @@ prof_set_quit(void)
|
|||||||
force_quit = TRUE;
|
force_quit = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
_main_update(gpointer data)
|
||||||
|
{
|
||||||
|
log_stderr_handler();
|
||||||
|
session_check_autoaway();
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBOTR
|
||||||
|
otr_poll();
|
||||||
|
#endif
|
||||||
|
plugins_run_timed();
|
||||||
|
notify_remind();
|
||||||
|
session_process_events();
|
||||||
|
iq_autoping_check();
|
||||||
|
ui_update();
|
||||||
|
chat_state_idle();
|
||||||
|
#ifdef HAVE_GTK
|
||||||
|
tray_update();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Always repeat
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_connect_default(const char* const account)
|
_connect_default(const char* const account)
|
||||||
{
|
{
|
||||||
|
@ -44,5 +44,6 @@ void prof_run(char* log_level, char* account_name, char* config_file, char* log_
|
|||||||
void prof_set_quit(void);
|
void prof_set_quit(void);
|
||||||
|
|
||||||
extern pthread_mutex_t lock;
|
extern pthread_mutex_t lock;
|
||||||
|
extern GMainLoop* mainloop;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -171,6 +171,45 @@ create_input_window(void)
|
|||||||
_inp_win_update_virtual();
|
_inp_win_update_virtual();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
_inp_callback(GIOChannel* source, GIOCondition condition, gpointer data)
|
||||||
|
{
|
||||||
|
rl_callback_read_char();
|
||||||
|
|
||||||
|
if (rl_line_buffer && rl_line_buffer[0] != '/' && rl_line_buffer[0] != '\0' && rl_line_buffer[0] != '\n') {
|
||||||
|
chat_state_activity();
|
||||||
|
}
|
||||||
|
|
||||||
|
ui_reset_idle_time();
|
||||||
|
if (!get_password) {
|
||||||
|
// Update the input buffer on screen
|
||||||
|
_inp_write(rl_line_buffer, rl_point);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (inp_line) {
|
||||||
|
ProfWin* window = wins_get_current();
|
||||||
|
|
||||||
|
if (!cmd_process_input(window, inp_line))
|
||||||
|
g_main_loop_quit(mainloop);
|
||||||
|
|
||||||
|
free(inp_line);
|
||||||
|
inp_line = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
inp_add_watch(void)
|
||||||
|
{
|
||||||
|
GIOChannel* channel = g_io_channel_unix_new(fileno(rl_instream));
|
||||||
|
if (g_io_channel_set_encoding(channel, NULL, NULL) != G_IO_STATUS_NORMAL) {
|
||||||
|
log_error("cannot set NULL encoding");
|
||||||
|
}
|
||||||
|
|
||||||
|
g_io_add_watch(channel, G_IO_IN, _inp_callback, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
char*
|
char*
|
||||||
inp_readline(void)
|
inp_readline(void)
|
||||||
{
|
{
|
||||||
|
@ -46,5 +46,6 @@ void inp_win_resize(void);
|
|||||||
void inp_put_back(void);
|
void inp_put_back(void);
|
||||||
char* inp_get_password(void);
|
char* inp_get_password(void);
|
||||||
char* inp_get_line(void);
|
char* inp_get_line(void);
|
||||||
|
void inp_add_watch(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
4
tests/unittests/ui/stub_inputwin.c
Normal file
4
tests/unittests/ui/stub_inputwin.c
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
void
|
||||||
|
inp_add_watch(void)
|
||||||
|
{
|
||||||
|
}
|
1
tests/unittests/ui/stub_inputwin.h
Normal file
1
tests/unittests/ui/stub_inputwin.h
Normal file
@ -0,0 +1 @@
|
|||||||
|
void inp_add_watch(void);
|
Loading…
Reference in New Issue
Block a user