diff options
| -rw-r--r-- | GNUmakefile | 5 | ||||
| -rw-r--r-- | gamt.c | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/GNUmakefile b/GNUmakefile index a05a862..c05b5b3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -19,7 +19,8 @@ include mk/Autoconf.mk define make-config LIB := $(LIB) -HAVE_GTK := $(call ac_pkg_config,gtk+-x11-3.0) +HAVE_GTK := $(call ac_pkg_config,gtk+-3.0) +HAVE_GDK := $(call ac_pkg_config,gdk-3.0) HAVE_VTE := $(call ac_pkg_config,vte-2.91) endef @@ -29,7 +30,7 @@ endef ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes) TARGETS += gamt gamt : CFLAGS += -Wno-strict-prototypes - gamt : pkglst += gtk+-x11-3.0 vte-2.90 + gamt : pkglst += gtk+-3.0 gdk-3.0 vte-2.91 endif CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst)) @@ -255,6 +255,7 @@ static void menu_cb_write_log(GtkToggleAction *action, gpointer data) static void menu_cb_config_font(GtkAction *action, void *data) { struct gamt_window *gamt = data; + PangoFontDescription *font; GtkWidget *dialog; char *fontname; int done = 0; @@ -271,7 +272,8 @@ static void menu_cb_config_font(GtkAction *action, void *data) /* fall through */ case GTK_RESPONSE_APPLY: fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog)); - vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), fontname); + font = pango_font_description_from_string(fontname); + vte_terminal_set_font(VTE_TERMINAL(gamt->vte), font); cfg_set_str(CFG_FONT, fontname); break; default: @@ -309,7 +311,7 @@ static void menu_cb_config_fg(GtkAction *action, void *data) gdk_rgba_parse(&color, cfg_get_str(CFG_FOREGROUND)); if (0 != pickcolor("Text color", &color)) return; - vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color); + vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color); snprintf(name, sizeof(name), "#%04x%04x%04x", (int)(color.red * 65535), (int)(color.green * 65535), @@ -326,7 +328,7 @@ static void menu_cb_config_bg(GtkAction *action, void *data) gdk_rgba_parse(&color, cfg_get_str(CFG_BACKGROUND)); if (0 != pickcolor("Background color", &color)) return; - vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color); + vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color); snprintf(name, sizeof(name), "#%04x%04x%04x", (int)(color.red * 65535), (int)(color.green * 65535), @@ -338,7 +340,7 @@ static void menu_cb_blink_cursor(GtkToggleAction *action, gpointer user_data) { struct gamt_window *gamt = user_data; gboolean state = gtk_toggle_action_get_active(action); - VteTerminalCursorBlinkMode blink; + VteCursorBlinkMode blink; if (amt_debug) fprintf(stderr, "%s: %s\n", __FUNCTION__, state ? "on" : "off"); @@ -781,7 +783,8 @@ static int gamt_connect(struct gamt_window *gamt) static struct gamt_window *gamt_window() { GtkWidget *vbox, *hbox, *frame, *item; - VteTerminalCursorBlinkMode blink; + PangoFontDescription *font; + VteCursorBlinkMode blink; GdkRGBA color; GError *err; gboolean state; @@ -823,7 +826,8 @@ static struct gamt_window *gamt_window() g_signal_connect(gamt->vte, "commit", G_CALLBACK(user_input), gamt); vte_terminal_set_scrollback_lines(VTE_TERMINAL(gamt->vte), 4096); str = cfg_get_str(CFG_FONT); - vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), str); + font = pango_font_description_from_string(str); + vte_terminal_set_font(VTE_TERMINAL(gamt->vte), font); /* FIXME: make configurable */ vte_terminal_set_backspace_binding(VTE_TERMINAL(gamt->vte), @@ -872,12 +876,12 @@ static struct gamt_window *gamt_window() str = cfg_get_str(CFG_FOREGROUND); if (str) { gdk_rgba_parse(&color, str); - vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color); + vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color); } str = cfg_get_str(CFG_BACKGROUND); if (str) { gdk_rgba_parse(&color, str); - vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color); + vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color); } return gamt; |