ralsina/st-patched
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing conflict

Browse Source
This commit is contained in:
TiynGER 2020-03-29 15:24:17 +02:00
commit 38e57c92d0
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
config.def.h
View File

@ -5,7 +5,8 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
static char *font = "mono:pixelsize=16:antialias=true:autohint=true";
static char *font2[] = "IBM Plex Mono:pixelsize=16:antialias=true:autohint=true";
static int borderpx = 2;
/*
@ -63,7 +64,7 @@ static unsigned int cursorthickness = 2;
static int bellvolume = 0;
/* default TERM value */
char *termname = "st-256color";
char *termname = "xterm-256color";
/*
* spaces per tab
@ -83,31 +84,32 @@ char *termname = "st-256color";
unsigned int tabspaces = 8;
/*bg opacity*/
float alpha = 0.8;
float alpha = 0.92;
/* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = {
/* 8 normal colors */
"black",
"red3",
"green3",
"yellow3",
"blue2",
"magenta3",
"cyan3",
"gray90",
/* 8 bright colors */
"gray50",
"red",
"green",
"yellow",
"#5c5cff",
"magenta",
"cyan",
"white",
"#1f1f1f", /* hard contrast: #1d2021 / soft contrast: #32302f */
"#f81118",
"#2dc55e",
"#ecba0f",
"#2a84d2",
"#4e5ab7",
"#1081d6",
"#d6dbe5",
"#d6dbe5",
"#de352e",
"#1dd361",
"#f3bd09",
"#1081d6",
"#5350b9",
"#0f7ddb",
"#ffffff",
[255] = 0,
/* more colors can be added after 255 to use with DefaultXX */
"#282828", /* 256 -> bg */
"#ebdbb2", /* 257 -> fg */
"#add8e6", /* 258 -> cursor */
/* more colors can be added after 255 to use with DefaultXX */
"#cccccc",
@ -120,10 +122,10 @@ static const char *colorname[] = {
* Default colors (colorname index)
* foreground, background, cursor, reverse cursor
*/
unsigned int defaultfg = 7;
unsigned int defaultbg = 258;
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
@ -167,9 +169,8 @@ static uint forcemousemod = ShiftMask;
*/
static MouseShortcut mshortcuts[] = {
/* mask button function argument release */
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
{ Button4, XK_NO_MOD, "\031" },
{ Button5, XK_NO_MOD, "\005" },
};
/* Internal keyboard shortcuts. */
@ -182,14 +183,16 @@ static Shortcut shortcuts[] = {
{ 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} },
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
{ TERMMOD, XK_V, clippaste, {.i = 0} },
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
{ ShiftMask, XK_Insert, clippaste, {.i = 0} },
{ MODKEY, XK_c, clipcopy, {.i = 0} },
{ MODKEY, XK_v, clippaste, {.i = 0} },
{ MODKEY, XK_p, selpaste, {.i = 0} },
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
{ MODKEY, XK_k, kscrollup, {.i = 1} },
{ MODKEY, XK_j, kscrolldown, {.i = 1} },
{ TERMMOD, XK_U, zoom, {.f = +1} },
{ TERMMOD, XK_U, zoom, {.f = +1} },
{ TERMMOD, XK_I, zoom, {.f = -1} },
};
/*