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

move URGENT_ON_BEEP and DYNAMIC_TITLE to config

Browse Source
This commit is contained in:
Daniel Micay 2012-06-07 13:54:15 -04:00
parent d1f54e57fc
commit 17275bd887
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.h
View File

@ -1,5 +1,3 @@
#define URGENT_ON_BEEP
#define DYNAMIC_TITLE
#define CLICKABLE_URL #define CLICKABLE_URL
//#define ICON_NAME "terminal" //#define ICON_NAME "terminal"

31
termite.c
View File

@ -210,7 +210,6 @@ static gboolean button_press_cb(VteTerminal *vte, GdkEventButton *event) {
} }
#endif #endif
#ifdef URGENT_ON_BEEP
static void beep_handler(GtkWindow *window) { static void beep_handler(GtkWindow *window) {
gtk_window_set_urgency_hint(window, TRUE); gtk_window_set_urgency_hint(window, TRUE);
} }
@ -219,14 +218,11 @@ static gboolean focus_in_handler(GtkWindow *window) {
gtk_window_set_urgency_hint(window, FALSE); gtk_window_set_urgency_hint(window, FALSE);
return FALSE; return FALSE;
} }
#endif
#ifdef DYNAMIC_TITLE
static void window_title_cb(VteTerminal *vte, GtkWindow *window) { static void window_title_cb(VteTerminal *vte, GtkWindow *window) {
const char *t = vte_terminal_get_window_title(vte); const char *t = vte_terminal_get_window_title(vte);
gtk_window_set_title(window, t ? t : "termite"); gtk_window_set_title(window, t ? t : "termite");
} }
#endif
static gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRectangle *alloc) { static gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRectangle *alloc) {
GtkWidget *vte = gtk_bin_get_child(overlay); GtkWidget *vte = gtk_bin_get_child(overlay);
@ -247,7 +243,7 @@ static gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRecta
#define IGNORE_ON_ERROR(ERROR) if (ERROR) { g_error_free(error); error = NULL; } else #define IGNORE_ON_ERROR(ERROR) if (ERROR) { g_error_free(error); error = NULL; } else
static void load_config(GtkWindow *window, VteTerminal *vte) { static void load_config(GtkWindow *window, VteTerminal *vte, gboolean *dynamic_title, gboolean *urgent_on_bell) {
GError *error = NULL; GError *error = NULL;
GKeyFile *config = g_key_file_new(); GKeyFile *config = g_key_file_new();
if (!g_key_file_load_from_file(config, "termite.cfg", G_KEY_FILE_NONE, &error)) { if (!g_key_file_load_from_file(config, "termite.cfg", G_KEY_FILE_NONE, &error)) {
@ -284,6 +280,12 @@ static void load_config(GtkWindow *window, VteTerminal *vte) {
vte_terminal_set_mouse_autohide(vte, mouse_autohide); vte_terminal_set_mouse_autohide(vte, mouse_autohide);
} }
*dynamic_title = g_key_file_get_boolean(config, "options", "dynamic_title", &error);
IGNORE_ON_ERROR(error) {}
*urgent_on_bell = g_key_file_get_boolean(config, "options", "urgent_on_bell", &error);
IGNORE_ON_ERROR(error) {}
gchar *font = g_key_file_get_string(config, "options", "font", &error); gchar *font = g_key_file_get_string(config, "options", "font", &error);
IGNORE_ON_ERROR(error) { IGNORE_ON_ERROR(error) {
vte_terminal_set_font_from_string(vte, font); vte_terminal_set_font_from_string(vte, font);
@ -409,7 +411,8 @@ int main(int argc, char **argv) {
g_signal_connect(entry, "key-press-event", G_CALLBACK(entry_key_press_cb), &info); g_signal_connect(entry, "key-press-event", G_CALLBACK(entry_key_press_cb), &info);
g_signal_connect(overlay, "get-child-position", G_CALLBACK(position_overlay_cb), NULL); g_signal_connect(overlay, "get-child-position", G_CALLBACK(position_overlay_cb), NULL);
load_config(GTK_WINDOW(window), VTE_TERMINAL(vte)); gboolean dynamic_title = FALSE, urgent_on_bell = FALSE;
load_config(GTK_WINDOW(window), VTE_TERMINAL(vte), &dynamic_title, &urgent_on_bell);
#ifdef TRANSPARENCY #ifdef TRANSPARENCY
GdkScreen *screen = gtk_widget_get_screen(window); GdkScreen *screen = gtk_widget_get_screen(window);
@ -446,15 +449,15 @@ int main(int argc, char **argv) {
g_signal_connect(vte, "button-press-event", G_CALLBACK(button_press_cb), NULL); g_signal_connect(vte, "button-press-event", G_CALLBACK(button_press_cb), NULL);
#endif #endif
#ifdef URGENT_ON_BEEP if (urgent_on_bell) {
g_signal_connect_swapped(vte, "beep", G_CALLBACK(beep_handler), window); g_signal_connect_swapped(vte, "beep", G_CALLBACK(beep_handler), window);
g_signal_connect(window, "focus-in-event", G_CALLBACK(focus_in_handler), NULL); g_signal_connect(window, "focus-in-event", G_CALLBACK(focus_in_handler), NULL);
#endif }
#ifdef DYNAMIC_TITLE if (dynamic_title) {
window_title_cb(VTE_TERMINAL(vte), GTK_WINDOW(window)); window_title_cb(VTE_TERMINAL(vte), GTK_WINDOW(window));
g_signal_connect(vte, "window-title-changed", G_CALLBACK(window_title_cb), window); g_signal_connect(vte, "window-title-changed", G_CALLBACK(window_title_cb), window);
#endif }
gtk_widget_grab_focus(vte); gtk_widget_grab_focus(vte);
gtk_widget_show_all(window); gtk_widget_show_all(window);

2
termite.cfg
View File

@ -5,6 +5,8 @@ scroll_on_keystroke = true
audible_bell = false audible_bell = false
visible_bell = false visible_bell = false
mouse_autohide = false mouse_autohide = false
dynamic_title = true
urgent_on_bell = true
font = Monospace 9 font = Monospace 9
scrollback_lines = 1000 scrollback_lines = 1000