From a605c88ba3a0180d5783722c2c877f2ab8b01659 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Wed, 1 Apr 2015 22:43:44 -0300 Subject: Rewritten as a client-server application, similar to urxvt{d,c}. --- src/T.c | 257 ----------------------------------------------------------- src/config.h | 68 ---------------- 2 files changed, 325 deletions(-) delete mode 100644 src/T.c delete mode 100644 src/config.h (limited to 'src') diff --git a/src/T.c b/src/T.c deleted file mode 100644 index c776983..0000000 --- a/src/T.c +++ /dev/null @@ -1,257 +0,0 @@ -/* - * T.c - * - * T is a lean Terminal emulator. - * - * This file is part of T. - * - * T is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later - * version. - * - * T is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * T. If not, see . - */ - -#include -#include -#include -#include -#include - -#include "config.h" - -static int window_count; - -/* Event callbacks */ -static gboolean window_delete_event_callback(GtkWidget *widget, GdkEvent *event, gpointer data); -static void window_destroy_callback(GtkWidget *widget, gpointer data); - -static gboolean key_press_callback(GtkWidget *widget, GdkEvent *event, gpointer data); - -static void terminal_child_exited_callback(VteTerminal *terminal, gpointer data); -static void terminal_window_title_changed_callback(VteTerminal *terminal, gpointer data); - -/* Helper functions */ -static void set_font_size(VteTerminal *terminal, int diff); -static void setup_pty(VteTerminal *terminal, GPid *child_pid); -static void set_preferences(VteTerminal *terminal); -static void setup_terminal(GtkWindow *window, VteTerminal *terminal); -static void setup_window(GtkWindow *window); -static void spawn_window(void); - -static gboolean -window_delete_event_callback(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - /* TODO: always false? */ - return FALSE; -} - -static void -window_destroy_callback(GtkWidget *widget, gpointer data) -{ - window_count--; - - if (window_count == 0) - gtk_main_quit(); -} - -static gboolean -key_press_callback(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - GdkEventKey *key_event = (GdkEventKey *) event; - VteTerminal *terminal = VTE_TERMINAL(widget); - - gboolean has_shift = (key_event->state & GDK_SHIFT_MASK) != 0; - gboolean has_control = (key_event->state & GDK_CONTROL_MASK) != 0; - - if (!has_control) - return FALSE; - - switch (key_event->keyval) { - case GDK_KEY_minus: - set_font_size(terminal, -1); - return TRUE; - case GDK_KEY_plus: - set_font_size(terminal, 1); - return TRUE; - } - - if (!has_shift) - return FALSE; - - /* Handles ctrl + shift + {c,v,n} */ - switch (key_event->keyval) { - case GDK_KEY_C: - case GDK_KEY_c: - /* turn this event into a Control+Insert and delegate it */ - key_event->keyval = GDK_KEY_Insert; - key_event->state &= ~GDK_SHIFT_MASK; - break; - case GDK_KEY_V: - case GDK_KEY_v: - /* turn this event into a Shift+Insert and delegate it */ - key_event->keyval = GDK_KEY_Insert; - key_event->state &= ~GDK_CONTROL_MASK; - break; - case GDK_KEY_N: - case GDK_KEY_n: - spawn_window(); - return TRUE; - } - - return FALSE; -} - -static void -terminal_child_exited_callback(VteTerminal *terminal, gpointer data) -{ - GtkWindow *window; - - window = GTK_WINDOW(data); - gtk_widget_destroy(GTK_WIDGET(window)); -} - -static void -terminal_window_title_changed_callback(VteTerminal *terminal, gpointer data) -{ - GtkWindow *window; - - window = (GtkWindow *) data; - gtk_window_set_title(window, vte_terminal_get_window_title(terminal)); -} - -static void -set_font_size(VteTerminal *terminal, int diff) -{ - PangoFontDescription *desc = (PangoFontDescription *) vte_terminal_get_font(terminal); - gint font_size = pango_font_description_get_size(desc) + diff * PANGO_SCALE; - pango_font_description_set_size(desc, font_size); - vte_terminal_set_font(terminal, desc); -} - -static void -setup_pty(VteTerminal *terminal, GPid *child_pid) -{ - VtePty* pty; - char *argv[] = { NULL, NULL }; - - /* TODO: error handling */ - argv[0] = vte_get_user_shell(); - pty = vte_terminal_pty_new(terminal, VTE_PTY_DEFAULT, NULL); - vte_terminal_set_pty_object(terminal, pty); - vte_terminal_fork_command_full(terminal, VTE_PTY_DEFAULT, ".", argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, child_pid, NULL); -} - -static void -set_preferences(VteTerminal *terminal) -{ - /* - * Options set here can (and should) be configured through config.h - */ - - /* - * These are static because this function is called every time a new window - * is created and we don't want to parse the colors all over again - */ - static gboolean colors_parsed = FALSE; - static GdkColor palette[CONFIG_PALETTE_SIZE], bg_color, fg_color; - - if (!colors_parsed) { - int i; - - gdk_color_parse(CONFIG_FOREGROUND_COLOR, &fg_color); - gdk_color_parse(CONFIG_BACKGROUND_COLOR, &bg_color); - for (i = 0; i < CONFIG_PALETTE_SIZE; ++i) - gdk_color_parse(CONFIG_COLOR_PALETTE[i], &palette[i]); - - colors_parsed = TRUE; - } - - /* Set preferences */ - vte_terminal_set_audible_bell(terminal, CONFIG_AUDIBLE_BELL); - vte_terminal_set_colors(terminal, &fg_color, &bg_color, palette, CONFIG_PALETTE_SIZE); - vte_terminal_set_cursor_blink_mode(terminal, CONFIG_CURSOR_BLINK_MODE); - vte_terminal_set_font_from_string(terminal, CONFIG_FONT_NAME); - vte_terminal_set_mouse_autohide(terminal, CONFIG_MOUSE_AUTOHIDE); - vte_terminal_set_scrollback_lines(terminal, CONFIG_SCROLLBACK_LINES); - vte_terminal_set_visible_bell(terminal, CONFIG_VISIBLE_BELL); -} - -static void -setup_terminal(GtkWindow *window, VteTerminal *terminal) -{ - GPid child_pid; - - setup_pty(terminal, &child_pid); - vte_terminal_watch_child(terminal, child_pid); - - g_signal_connect(terminal, "child-exited", G_CALLBACK(terminal_child_exited_callback), window); - g_signal_connect(terminal, "key-press-event", G_CALLBACK(key_press_callback), window); - g_signal_connect(terminal, "window-title-changed", G_CALLBACK(terminal_window_title_changed_callback), window); - - set_preferences(terminal); -} - -static void -setup_window(GtkWindow *window) -{ - GdkGeometry hints; - VteTerminal *terminal; - - terminal = (VteTerminal *) vte_terminal_new(); - setup_terminal(window, terminal); - - hints.base_width = vte_terminal_get_char_width(terminal); - hints.base_height = vte_terminal_get_char_height(terminal); - hints.min_width = hints.base_width * CONFIG_MIN_WIDTH; - hints.min_height = hints.base_height * CONFIG_MIN_HEIGHT; - hints.width_inc = hints.base_width; - hints.height_inc = hints.base_height; - gtk_window_set_geometry_hints(window, GTK_WIDGET(terminal), &hints, GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE); - - g_signal_connect(window, "delete-event", G_CALLBACK(window_delete_event_callback), NULL); - g_signal_connect(window, "destroy", G_CALLBACK(window_destroy_callback), NULL); - gtk_window_set_icon_name(window, "utilities-terminal"); - - gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(terminal)); - - gtk_widget_show(GTK_WIDGET(terminal)); - gtk_widget_show(GTK_WIDGET(window)); -} - -static void -spawn_window(void) -{ - GtkWindow *window; - - window = (GtkWindow *) gtk_window_new(GTK_WINDOW_TOPLEVEL); - setup_window(window); - - window_count++; -} - -int -main(int argc, char *argv[]) -{ - gtk_init(&argc, &argv); - - /* Initial state: single window */ - window_count = 0; - spawn_window(); - - /* - * TODO: - * Find out a nice and clean way of opening more windows when the user - * does not have focus on a T window. - */ - - gtk_main(); - - return 0; -} diff --git a/src/config.h b/src/config.h deleted file mode 100644 index ee466ee..0000000 --- a/src/config.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * config.h - * - * Configuration file. Modify these to customize T. - * - * This file is part of T. - * - * T is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later - * version. - * - * T is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * T. If not, see . - */ - -/* Minimum width/height, in characters */ -#define CONFIG_MIN_WIDTH 20 -#define CONFIG_MIN_HEIGHT 5 - -/* Font */ -#define CONFIG_FONT_NAME "Monospace 9" - -/* Color palette definition */ -/* PALETTE_SIZE must be 8, 16, 24 or between 25 and 255, inclusive */ -#define CONFIG_PALETTE_SIZE 16 - -static const char *CONFIG_COLOR_PALETTE[CONFIG_PALETTE_SIZE] = { - "#000000", /* 0 Black */ - "#95513a", /* 1 Red */ - "#3a9551", /* 2 Green */ - "#7e953a", /* 3 Yellow */ - "#3d558d", /* 4 Blue */ - "#953a7e", /* 5 Magenta */ - "#3a7e95", /* 6 Cyan */ - "#d9d9d9", /* 7 White */ - "#262626", /* 8 Black */ - "#c17860", /* 9 Red */ - "#60c178", /* 10 Green */ - "#a9c160", /* 11 Yellow */ - "#5f7aba", /* 12 Blue */ - "#c160a9", /* 13 Magenta */ - "#60a9c1", /* 14 Cyan */ - "#ffffff", /* 15 White */ -}; - -/* Foreground and background. */ -#define CONFIG_FOREGROUND_COLOR "#d9e6f2" /* COLOR_PALETTE[7] */ -#define CONFIG_BACKGROUND_COLOR "#0d1926" /* COLOR_PALETTE[0] */ - -/* Scrollback lines (0 means disabled; negative means "infinite") */ -#define CONFIG_SCROLLBACK_LINES 2000 - -/* Mouse auto-hide (TRUE or FALSE) */ -#define CONFIG_MOUSE_AUTOHIDE TRUE - -/* Audible bell (TRUE or FALSE) */ -#define CONFIG_AUDIBLE_BELL FALSE - -/* Visible bell (TRUE or FALSE) */ -#define CONFIG_VISIBLE_BELL FALSE - -/* Cursor blink mode. One of: VTE_CURSOR_BLINK_SYSTEM/ON/OFF */ -#define CONFIG_CURSOR_BLINK_MODE VTE_CURSOR_BLINK_OFF -- cgit v1.2.3