Compare commits

..

10 commits

4 changed files with 4268 additions and 4526 deletions

View file

@ -5,7 +5,15 @@
* *
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/ */
<<<<<<< HEAD
static char *font = "mono:pixelsize=14:antialias=true:autohint=true"; static char *font = "mono:pixelsize=14:antialias=true:autohint=true";
/* Spare fonts */
static char *font2[] = {
/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true",
*/
/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
};
static int borderpx = 2; static int borderpx = 2;
/* /*
@ -125,7 +133,6 @@ static const char *colorname[] = {
"black", "black",
}; };
/* /*
* Default colors (colorname index) * Default colors (colorname index)
* foreground, background, cursor, reverse cursor * foreground, background, cursor, reverse cursor
@ -508,7 +515,6 @@ static uint selmasks[] = {
* Printable characters in ASCII, used to estimate the advance width * Printable characters in ASCII, used to estimate the advance width
* of single wide characters. * of single wide characters.
*/ */
static char ascii_printable[] = static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
" !\"#$%&'()*+,-./0123456789:;<=>?"
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
"`abcdefghijklmnopqrstuvwxyz{|}~"; "`abcdefghijklmnopqrstuvwxyz{|}~";

View file

@ -6,7 +6,8 @@
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/ */
static char *font = static char *font =
"FiraCode Nerd Font Mono:pixelsize=13:antialias=true:autohint=true"; "IosevkaTermSlab Nerd Font Propo:pixelsize=15:antialias=true:autohint=true";
static char *font2[] = {"Noto Color Emoji: pixelsize=12"};
static int borderpx = 4; static int borderpx = 4;
static int dark = 0; static int dark = 0;
@ -96,26 +97,26 @@ char *termname = "st-256color";
unsigned int tabspaces = 8; unsigned int tabspaces = 8;
/* bg opacity */ /* bg opacity */
float alpha = 0.9; float alpha = 1.00;
/* Terminal colors (16 first used in escape sequence) */ /* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = { static const char *colorname[] = {
"#1C1917", "#191919",
"#DE6E7C", "#DE6E7C",
"#819B69", "#819B69",
"#B77E64", "#B77E64",
"#6099C0", "#6099C0",
"#B279A7", "#B279A7",
"#66A5AD", "#66A5AD",
"#B4BDC3", "#BBBBBB",
"#403833", "#3d3839",
"#E8838F", "#E8838F",
"#8BAE68", "#8BAE68",
"#D68C67", "#D68C67",
"#61ABDA", "#61ABDA",
"#CF86C1", "#CF86C1",
"#65B8C1", "#65B8C1",
"#888F94", "#8e8e8e",
[255] = 0, [255] = 0,
/* more colors can be added after 255 to use with DefaultXX */ /* more colors can be added after 255 to use with DefaultXX */
@ -192,42 +193,6 @@ static unsigned int defaultattr = 11;
*/ */
static uint forcemousemod = ShiftMask; static uint forcemousemod = ShiftMask;
/*
* Xresources preferences to load at startup
*/
ResourcePref resources[] = {
// { "font", STRING, &font },
// { "color0", STRING, &colorname[0] },
// { "color1", STRING, &colorname[1] },
// { "color2", STRING, &colorname[2] },
// { "color3", STRING, &colorname[3] },
// { "color4", STRING, &colorname[4] },
// { "color5", STRING, &colorname[5] },
// { "color6", STRING, &colorname[6] },
// { "color7", STRING, &colorname[7] },
// { "color8", STRING, &colorname[8] },
// { "color9", STRING, &colorname[9] },
// { "color10", STRING, &colorname[10] },
// { "color11", STRING, &colorname[11] },
// { "color12", STRING, &colorname[12] },
// { "color13", STRING, &colorname[13] },
// { "color14", STRING, &colorname[14] },
// { "color15", STRING, &colorname[15] },
// { "background", STRING, &colorname[256] },
// { "foreground", STRING, &colorname[257] },
// { "cursorColor", STRING, &colorname[258] },
// { "termname", STRING, &termname },
// { "shell", STRING, &shell },
// { "minlatency", INTEGER, &minlatency },
// { "maxlatency", INTEGER, &maxlatency },
// { "blinktimeout", INTEGER, &blinktimeout },
// { "bellvolume", INTEGER, &bellvolume },
// { "tabspaces", INTEGER, &tabspaces },
// { "borderpx", INTEGER, &borderpx },
// { "cwscale", FLOAT, &cwscale },
// { "chscale", FLOAT, &chscale },
};
/* /*
* Internal mouse shortcuts. * Internal mouse shortcuts.
* Beware that overloading Button1 will disable the selection. * Beware that overloading Button1 will disable the selection.

603
st.c

File diff suppressed because it is too large Load diff

818
x.c

File diff suppressed because it is too large Load diff