commit 44dcf5d98b08493c888654ba07993d2fce19d499
parent a97e50f9e81d4113322dd2eeacbf5fb670047419
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Sun, 16 Dec 2018 16:09:01 +0100
Fix makefile and bind zoom to Alt+Shift+Plus/Underscore
Diffstat:
| M | Makefile | | | 7 | ++++--- |
| M | config.h | | | 93 | +++++++++++++++++++++++++++++++++---------------------------------------------- |
| M | general.diff | | | 107 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
3 files changed, 150 insertions(+), 57 deletions(-)
diff --git a/Makefile b/Makefile
@@ -6,7 +6,6 @@ st/st: st/config.h
st/config.h: st/config.def.h general.diff st-alpha-0.8.1.diff config.h
@echo "Copying default configuration to source directory"
- cp $< $@
@echo "Apply patches"
-for f in *.diff; do cp $$f st/ && (cd st && patch -p1 -N < $$f); done
@@ -20,9 +19,11 @@ st/:
install: st/st
sudo make -C st/ install
-general.diff: st/config.h
- diff -u st/config.h config.h > $@
+general.diff: config.h
+ cp st/config.def.h st/config.h
+ -diff -u st/config.h $< > $@
.PHONY: clean
clean:
$(RM) -r st/
+ $(RM) general.diff
diff --git a/config.h b/config.h
@@ -83,47 +83,35 @@ char *termname = "st-256color";
unsigned int tabspaces = 8;
/* bg opacity */
-//unsigned int alpha = 0xed;
-unsigned int alpha = 220;
+unsigned int alpha = 230;
static const char *colorname[] = {
- "#434944",
- "#da5673",
- "#8cc16d",
- "#eebf35",
- "#5cabdc",
- "#b595cf",
- "#44a9ba",
- "#fbfbf8",
- "#6c6d6b",
- "#dba2b4",
- "#898e38",
- "#8a6b3d",
- "#126b8c",
- "#7457a2",
- "#87c7d4",
- "#bfc2bc",
- // "#000000", /* hard contrast: #1d2021 / soft contrast: #32302f */
- // "#cc241d",
- // "#98971a",
- // "#d79921",
- // "#458588",
- // "#b16286",
- // "#689d6a",
- // "#a89984",
- // "#928374",
- // "#fb4934",
- // "#b8bb26",
- // "#fabd2f",
- // "#83a598",
- // "#d3869b",
- // "#8ec07c",
- // "#ebdbb2",
- // [255] = 0,
- /* more colors can be added after 255 to use with DefaultXX */
- [256] = "#000000", /* 256 -> bg */
- [257] = "#ffffff", /* 257 -> fg */
- [258] = "#ff00ff" /* 258 -> cursorcolor */
+ /* 8 normal colors */
+ "#434944",
+ "#da5673",
+ "#8cc16d",
+ "#eebf35",
+ "#5cabdc",
+ "#b595cf",
+ "#44a9ba",
+ "#fbfbf8",
+
+ /* 8 bright colors */
+ "#6c6d6b",
+ "#dba2b4",
+ "#898e38",
+ "#8a6b3d",
+ "#126b8c",
+ "#7457a2",
+ "#87c7d4",
+ "#bfc2bc",
+
+ [255] = 0,
+
+ /* more colors can be added after 255 to use with DefaultXX */
+ [256] = "#000000", /* bg */
+ [257] = "#ffffff", /* fg */
+ [258] = "#ff00ff", /* cursorcolor */
};
@@ -180,21 +168,18 @@ static MouseShortcut mshortcuts[] = {
#define TERMMOD (ControlMask|ShiftMask)
static Shortcut shortcuts[] = {
- /* mask keysym function argument */
- { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
- { ControlMask, XK_Print, toggleprinter, {.i = 0} },
- { ShiftMask, XK_Print, printscreen, {.i = 0} },
- { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
- { MODKEY|ShiftMask, XK_+, zoom, {.f = +1} },
- { MODKEY|ShiftMask, XK_-, zoom, {.f = -1} },
- { MODKEY, XK_Home, zoomreset, {.f = 0} },
- { TERMMOD, XK_Prior, zoom, {.f = +1} },
- { TERMMOD, XK_Next, zoom, {.f = -1} },
- { TERMMOD, XK_Home, zoomreset, {.f = 0} },
- { TERMMOD, XK_C, clipcopy, {.i = 0} },
- { TERMMOD, XK_V, clippaste, {.i = 0} },
- { TERMMOD, XK_Y, selpaste, {.i = 0} },
- { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
+ /* mask keysym function argument */
+ { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
+ { ControlMask, XK_Print, toggleprinter, {.i = 0} },
+ { ShiftMask, XK_Print, printscreen, {.i = 0} },
+ { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
+ { MODKEY|ShiftMask, XK_plus, zoom, {.f = +1} },
+ { MODKEY|ShiftMask, XK_underscore, zoom, {.f = -1} },
+ { MODKEY, XK_Home, zoomreset, {.f = 0} },
+ { TERMMOD, XK_C, clipcopy, {.i = 0} },
+ { TERMMOD, XK_V, clippaste, {.i = 0} },
+ { TERMMOD, XK_Y, selpaste, {.i = 0} },
+ { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
};
/*
diff --git a/general.diff b/general.diff
@@ -0,0 +1,107 @@
+--- st/config.h 2018-12-16 16:08:37.323716503 +0100
++++ config.h 2018-12-16 16:08:36.257049872 +0100
+@@ -5,7 +5,7 @@
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
++static char *font = "Pragmata Pro:pixelsize=14:antialias=true:autohint=true";
+ static int borderpx = 2;
+
+ /*
+@@ -24,8 +24,8 @@
+ char *vtiden = "\033[?6c";
+
+ /* Kerning / character bounding-box multipliers */
+-static float cwscale = 1.0;
+-static float chscale = 1.0;
++static float cwscale = 0.925;
++static float chscale = 0.9;
+
+ /*
+ * word delimiter string
+@@ -83,36 +83,35 @@
+ unsigned int tabspaces = 8;
+
+ /* bg opacity */
+-unsigned int alpha = 0xcc;
++unsigned int alpha = 230;
+
+-/* Terminal colors (16 first used in escape sequence) */
+ static const char *colorname[] = {
+ /* 8 normal colors */
+- "black",
+- "red3",
+- "green3",
+- "yellow3",
+- "blue2",
+- "magenta3",
+- "cyan3",
+- "gray90",
++ "#434944",
++ "#da5673",
++ "#8cc16d",
++ "#eebf35",
++ "#5cabdc",
++ "#b595cf",
++ "#44a9ba",
++ "#fbfbf8",
+
+ /* 8 bright colors */
+- "gray50",
+- "red",
+- "green",
+- "yellow",
+- "#5c5cff",
+- "magenta",
+- "cyan",
+- "white",
++ "#6c6d6b",
++ "#dba2b4",
++ "#898e38",
++ "#8a6b3d",
++ "#126b8c",
++ "#7457a2",
++ "#87c7d4",
++ "#bfc2bc",
+
+ [255] = 0,
+
+ /* more colors can be added after 255 to use with DefaultXX */
+- "#cccccc",
+- "#555555",
+- "black",
++ [256] = "#000000", /* bg */
++ [257] = "#ffffff", /* fg */
++ [258] = "#ff00ff", /* cursorcolor */
+ };
+
+
+@@ -120,10 +119,10 @@
+ * Default colors (colorname index)
+ * foreground, background, cursor, reverse cursor
+ */
+-unsigned int defaultfg = 7;
+-unsigned int defaultbg = 257;
+-static unsigned int defaultcs = 256;
+-static unsigned int defaultrcs = 257;
++unsigned int defaultfg = 257;
++unsigned int defaultbg = 256;
++static unsigned int defaultcs = 258;
++static unsigned int defaultrcs = 0;
+
+ /*
+ * Default shape of cursor
+@@ -174,9 +173,9 @@
+ { ControlMask, XK_Print, toggleprinter, {.i = 0} },
+ { ShiftMask, XK_Print, printscreen, {.i = 0} },
+ { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
+- { TERMMOD, XK_Prior, zoom, {.f = +1} },
+- { TERMMOD, XK_Next, zoom, {.f = -1} },
+- { TERMMOD, XK_Home, zoomreset, {.f = 0} },
++ { MODKEY|ShiftMask, XK_plus, zoom, {.f = +1} },
++ { MODKEY|ShiftMask, XK_underscore, zoom, {.f = -1} },
++ { MODKEY, XK_Home, zoomreset, {.f = 0} },
+ { TERMMOD, XK_C, clipcopy, {.i = 0} },
+ { TERMMOD, XK_V, clippaste, {.i = 0} },
+ { TERMMOD, XK_Y, selpaste, {.i = 0} },
