takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reload config file on SIGUSR1 

Refactor config reloading into a lambda stored globally.

Closes #131
This commit is contained in:
Simon Gomizelj 2013-10-23 15:07:41 -04:00
parent 132dbda8f6
commit dc9948bbd1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
termite.cc
View File

@ -126,6 +126,8 @@ static void set_config(GtkWindow *window, VteTerminal *vte, config_info *info,
char **geometry, GKeyFile *config); char **geometry, GKeyFile *config);
static long first_row(VteTerminal *vte); static long first_row(VteTerminal *vte);
static std::function<void ()> reload_config;
void launch_browser(char *browser, char *url) { void launch_browser(char *browser, char *url) {
char *browser_cmd[3] = {browser, url, nullptr}; char *browser_cmd[3] = {browser, url, nullptr};
g_spawn_async(nullptr, browser_cmd, nullptr, G_SPAWN_SEARCH_PATH, nullptr, nullptr, nullptr, nullptr); g_spawn_async(nullptr, browser_cmd, nullptr, G_SPAWN_SEARCH_PATH, nullptr, nullptr, nullptr, nullptr);
@ -759,8 +761,7 @@ gboolean key_press_cb(VteTerminal *vte, GdkEventKey *event, keybind_info *info)
vte_terminal_paste_clipboard(vte); vte_terminal_paste_clipboard(vte);
return TRUE; return TRUE;
case GDK_KEY_r: case GDK_KEY_r:
load_config(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(vte))), reload_config();
vte, &info->config, nullptr);
return TRUE; return TRUE;
} }
} else if (modifiers == GDK_CONTROL_MASK && event->keyval == GDK_KEY_Tab) { } else if (modifiers == GDK_CONTROL_MASK && event->keyval == GDK_KEY_Tab) {
@ -1341,6 +1342,11 @@ int main(int argc, char **argv) {
load_config(GTK_WINDOW(window), vte, &info.config, geometry ? nullptr : &geometry); load_config(GTK_WINDOW(window), vte, &info.config, geometry ? nullptr : &geometry);
reload_config = [&]{
load_config(GTK_WINDOW(window), vte, &info.config, nullptr);
};
signal(SIGUSR1, [](int){ reload_config(); });
vte_terminal_set_pty_object(vte, pty); vte_terminal_set_pty_object(vte, pty);
vte_pty_set_term(pty, term); vte_pty_set_term(pty, term);