From a20ee81fa5cf02ed3c191333ee499dd950e8683d Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sat, 20 Sep 2014 01:20:17 +0200 Subject: [PATCH] terminal: switch to evilvte With a custom compilation. It supports more stuff than xfce4-terminal, notably italics. There are still a lot to do to have something as nice as rxvt... Should be compiled with GTK3, otherwise, it will have the same problems than xfce4-terminal. --- evilvte-config.h | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/quake.lua | 3 ++- rc.lua | 4 ++-- rc/quake.lua | 2 +- requirements.txt | 2 +- xfce4-terminalrc | 28 ---------------------- 6 files changed, 67 insertions(+), 33 deletions(-) create mode 100644 evilvte-config.h delete mode 100644 xfce4-terminalrc diff --git a/evilvte-config.h b/evilvte-config.h new file mode 100644 index 0000000..5846f7a --- /dev/null +++ b/evilvte-config.h @@ -0,0 +1,61 @@ +/* Use // to disable options */ + +#define BACKGROUND_SATURATION 0.15 +#define BACKGROUND_OPACITY TRUE /* True transparent background */ +#define BELL_AUDIBLE FALSE +#define BELL_VISIBLE FALSE +#define BELL_URGENT FALSE +#define COLOR_BACKGROUND "#000000" +#define COLOR_FOREGROUND "white" +#define COLOR_STYLE USER_CUSTOM +#define USER_COLOR_00 0x111111 +#define USER_COLOR_08 0x666666 +#define USER_COLOR_01 0xd36265 +#define USER_COLOR_09 0xef8171 +#define USER_COLOR_02 0xaece91 +#define USER_COLOR_10 0xcfefb3 +#define USER_COLOR_03 0xe7e18c +#define USER_COLOR_11 0xfff796 +#define USER_COLOR_04 0x5297cf +#define USER_COLOR_12 0x74b8ef +#define USER_COLOR_05 0x963c59 +#define USER_COLOR_13 0xb85e7b +#define USER_COLOR_06 0x5E7175 +#define USER_COLOR_14 0xA3BABF +#define USER_COLOR_07 0xbebebe +#define USER_COLOR_15 0xffffff + +// #define COLOR_TEXT_BOLD "red" +// #define COLOR_TEXT_DIM "#FFFF00" +// #define COLOR_TEXT_HIGHLIGHTED "green" +#define COMMAND_EXEC_PROGRAM TRUE /* -e option, execute program */ +#define COMMAND_SHOW_OPTIONS TRUE /* -o option, show build-time options */ +#define COMMAND_SHOW_VERSION TRUE /* -v option, show program version */ +#define CURSOR_BLINKS FALSE +#define CURSOR_COLOR "green" +#define CURSOR_SHAPE BLOCK +#define DEFAULT_COMMAND g_getenv("SHELL") +#define DEFAULT_DIRECTORY g_get_current_dir() +#define FONT "DejaVu Sans Mono for Powerline 9" +#define FONT_ANTI_ALIAS TRUE +#define FONT_ENABLE_BOLD_TEXT TRUE +#define PROGRAM_WM_CLASS TRUE +#define SCROLL_LINES 5000 /* Negative value means unlimited */ +#define SCROLL_ON_KEYSTROKE TRUE +#define SCROLL_ON_OUTPUT FALSE +#define SCROLLBAR OFF_R /* Options: LEFT, RIGHT, OFF_L, OFF_R */ +#define SHOW_WINDOW_BORDER FALSE +#define SHOW_WINDOW_DECORATED FALSE +#define SHOW_WINDOW_ICON TRUE +#define STATUS_BAR FALSE +#define WINDOW_TITLE_DYNAMIC TRUE +#define WORD_CHARS "-A-Za-z0-9_$.+!*(),;:@&=?/~#%" + +#define MENU FALSE +#define TAB FALSE + +#define HOTKEY TRUE +#define HOTKEY_PASTE SHIFT(GDK_Insert) +#define HOTKEY_FONT_BIGGER CTRL(GDK_plus) +#define HOTKEY_FONT_SMALLER CTRL(GDK_minus) +#define HOTKEY_FONT_DEFAULT_SIZE CTRL(GDK_equal) diff --git a/lib/quake.lua b/lib/quake.lua index 0dbdacf..146c1ec 100644 --- a/lib/quake.lua +++ b/lib/quake.lua @@ -71,7 +71,8 @@ function QuakeConsole:display() if not client then -- The client does not exist, we spawn it - awful.util.spawn(self.terminal .. " " .. string.format(self.argname, self.name), + awful.util.spawn("env RESOURCE_NAME=" .. self.name .. " " .. + self.terminal .. " " .. string.format(self.argname, self.name), false, self.screen) return end diff --git a/rc.lua b/rc.lua index 4001033..4fb22e4 100644 --- a/rc.lua +++ b/rc.lua @@ -45,8 +45,8 @@ os.execute("test -d " .. awful.util.getdir("cache") .. -- Global configuration modkey = "Mod4" config = {} -config.terminal = "xfce4-terminal" -config.termclass = "terminal" +config.terminal = "evilvte" +config.termclass = "Evilvte" config.layouts = { awful.layout.suit.tile, awful.layout.suit.tile.left, diff --git a/rc/quake.lua b/rc/quake.lua index 903603f..933bd9c 100644 --- a/rc/quake.lua +++ b/rc/quake.lua @@ -3,7 +3,7 @@ local quake = loadrc("quake", "vbe/quake") local quakeconsole = {} for s = 1, screen.count() do quakeconsole[s] = quake({ terminal = config.terminal, - argname = "--role %s", + argname = " ", height = 0.3, screen = s }) end diff --git a/requirements.txt b/requirements.txt index adb1635..cfc8430 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,4 +21,4 @@ pidgin gnome-bluetooth pulseaudio numlockx -xfce4-terminal +evilvte diff --git a/xfce4-terminalrc b/xfce4-terminalrc deleted file mode 100644 index 7d7949e..0000000 --- a/xfce4-terminalrc +++ /dev/null @@ -1,28 +0,0 @@ -[Configuration] -FontName=DejaVu Sans Mono for Powerline 9 -MiscAlwaysShowTabs=FALSE -MiscBell=FALSE -MiscBordersDefault=FALSE -MiscCursorBlinks=FALSE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK -MiscDefaultGeometry=80x24 -MiscInheritGeometry=FALSE -MiscMenubarDefault=FALSE -MiscMouseAutohide=FALSE -MiscToolbarDefault=FALSE -MiscConfirmClose=TRUE -MiscCycleTabs=TRUE -MiscTabCloseButtons=TRUE -MiscTabCloseMiddleClick=TRUE -MiscTabPosition=GTK_POS_TOP -MiscHighlightUrls=TRUE -BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT -BackgroundDarkness=0,850000 -ColorPalette=#111111;#d36265;#aece91;#e7e18c;#5297cf;#963c59;#5E7175;#bebebe;#666666;#ef8171;#cfefb3;#fff796;#74b8ef;#b85e7b;#A3BABF;#ffffff -ShortcutsNoMenukey=TRUE -ScrollingOnOutput=FALSE -ScrollingBar=TERMINAL_SCROLLBAR_NONE -ScrollingLines=5000 -ShortcutsNoMnemonics=TRUE -TitleMode=TERMINAL_TITLE_REPLACE -