logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://hacktivis.me/git/etc_portage.git

0005-apply-st-gruvbox-both-0.8.1.diff.patch (5429B)

    

  1. From a5f5407bbcaa7d232af0e43bcacaac39d9b871ea Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Tue, 23 Oct 2018 02:39:08 +0200
  4. Subject: [PATCH 5/5] apply st-gruvbox-both-0.8.1.diff
  6. ---
  7.  config.def.h | 68 +++++++++++++++++++++++++++++++++-------------------
  8.  st.h         |  1 +
  9.  x.c          | 28 +++++++++++++++++-----
  10.  3 files changed, 66 insertions(+), 31 deletions(-)
  12. diff --git a/config.def.h b/config.def.h
  13. index 78ebbc5..5f9a078 100644
  14. --- a/config.def.h
  15. +++ b/config.def.h
  16. @@ -84,31 +84,48 @@ unsigned int tabspaces = 8;
  17.  
  18.  /* Terminal colors (16 first used in escape sequence) */
  19.  static const char *colorname[] = {
  20. -	/* 8 normal colors */
  21. -	"black",
  22. -	"red3",
  23. -	"green3",
  24. -	"yellow3",
  25. -	"blue2",
  26. -	"magenta3",
  27. -	"cyan3",
  28. -	"gray90",
  29. -
  30. -	/* 8 bright colors */
  31. -	"gray50",
  32. -	"red",
  33. -	"green",
  34. -	"yellow",
  35. -	"#5c5cff",
  36. -	"magenta",
  37. -	"cyan",
  38. -	"white",
  39. +	/* gruvbox dark */
  40. +	"#282828", /* hard contrast: #1d2021 / soft contrast: #32302f / normal: #282828 */
  41. +	"#cc241d",
  42. +	"#98971a",
  43. +	"#d79921",
  44. +	"#458588",
  45. +	"#b16286",
  46. +	"#689d6a",
  47. +	"#a89984",
  48. +	"#928374",
  49. +	"#fb4934",
  50. +	"#b8bb26",
  51. +	"#fabd2f",
  52. +	"#83a598",
  53. +	"#d3869b",
  54. +	"#8ec07c",
  55. +	"#ebdbb2",
  56.  
  57.  	[255] = 0,
  58. +};
  59.  
  60. -	/* more colors can be added after 255 to use with DefaultXX */
  61. -	"#cccccc",
  62. -	"#555555",
  63. +/* Terminal colors for alternate (light) palette */
  64. +static const char *altcolorname[] = {
  65. +	/* gruvbox light */
  66. +	"#fbf1c7", /* hard contrast: #f9f5d7 / soft contrast: #f2e5bc / normal: #fbf1c7 */
  67. +	"#cc241d",
  68. +	"#98971a",
  69. +	"#d79921",
  70. +	"#458588",
  71. +	"#b16286",
  72. +	"#689d6a",
  73. +	"#7c6f64",
  74. +	"#928374",
  75. +	"#9d0006",
  76. +	"#79740e",
  77. +	"#b57614",
  78. +	"#076678",
  79. +	"#8f3f71",
  80. +	"#427b58",
  81. +	"#3c3836",
  82. +
  83. +	[255] = 0,
  84.  };
  85.  
  86.  
  87. @@ -116,10 +133,10 @@ static const char *colorname[] = {
  88.   * Default colors (colorname index)
  89.   * foreground, background, cursor, reverse cursor
  90.   */
  91. -unsigned int defaultfg = 7;
  92. +unsigned int defaultfg = 15;
  93.  unsigned int defaultbg = 0;
  94. -static unsigned int defaultcs = 256;
  95. -static unsigned int defaultrcs = 257;
  96. +static unsigned int defaultcs = 15;
  97. +static unsigned int defaultrcs = 0;
  98.  
  99.  /*
  100.   * Default shape of cursor
  101. @@ -178,6 +195,7 @@ static Shortcut shortcuts[] = {
  102.  	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
  103.  	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
  104.  	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
  105. +	{ TERMMOD,              XK_F6,          swapcolors,     {.i =  0} },
  106.  };
  107.  
  108.  /*
  109. diff --git a/st.h b/st.h
  110. index 38c61c4..941b5f8 100644
  111. --- a/st.h
  112. +++ b/st.h
  113. @@ -117,6 +117,7 @@ extern char *vtiden;
  114.  extern char *worddelimiters;
  115.  extern int allowaltscreen;
  116.  extern char *termname;
  117. +extern int usealtcolors;
  118.  extern unsigned int tabspaces;
  119.  extern unsigned int defaultfg;
  120.  extern unsigned int defaultbg;
  121. diff --git a/x.c b/x.c
  122. index 2cd76d0..5a54960 100644
  123. --- a/x.c
  124. +++ b/x.c
  125. @@ -53,6 +53,7 @@ static void clipcopy(const Arg *);
  126.  static void clippaste(const Arg *);
  127.  static void numlock(const Arg *);
  128.  static void selpaste(const Arg *);
  129. +static void swapcolors(const Arg *);
  130.  static void zoom(const Arg *);
  131.  static void zoomabs(const Arg *);
  132.  static void zoomreset(const Arg *);
  133. @@ -244,6 +245,8 @@ static char *opt_title = NULL;
  134.  
  135.  static int oldbutton = 3; /* button event on startup: 3 = release */
  136.  
  137. +int usealtcolors = 0; /* 1 to use alternate palette */
  138. +
  139.  void
  140.  clipcopy(const Arg *dummy)
  141.  {
  142. @@ -282,6 +285,14 @@ numlock(const Arg *dummy)
  143.  	win.mode ^= MODE_NUMLOCK;
  144.  }
  145.  
  146. +void
  147. +swapcolors(const Arg *dummy)
  148. +{
  149. +	usealtcolors = !usealtcolors;
  150. +	xloadcols();
  151. +	redraw();
  152. +}
  153. +
  154.  void
  155.  zoom(const Arg *arg)
  156.  {
  157. @@ -706,6 +717,11 @@ sixd_to_16bit(int x)
  158.  	return x == 0 ? 0 : 0x3737 + 0x2828 * x;
  159.  }
  160.  
  161. +const char* getcolorname(int i)
  162. +{
  163. +    return (usealtcolors) ?  altcolorname[i] : colorname[i];
  164. +}
  165. +
  166.  int
  167.  xloadcolor(int i, const char *name, Color *ncolor)
  168.  {
  169. @@ -724,7 +740,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
  170.  			return XftColorAllocValue(xw.dpy, xw.vis,
  171.  			                          xw.cmap, &color, ncolor);
  172.  		} else
  173. -			name = colorname[i];
  174. +			name = getcolorname(i);
  175.  	}
  176.  
  177.  	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
  178. @@ -741,14 +757,14 @@ xloadcols(void)
  179.  		for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
  180.  			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
  181.  	} else {
  182. -		dc.collen = MAX(LEN(colorname), 256);
  183. +		dc.collen = MAX(LEN(colorname), LEN(altcolorname));
  184.  		dc.col = xmalloc(dc.collen * sizeof(Color));
  185.  	}
  186.  
  187.  	for (i = 0; i < dc.collen; i++)
  188.  		if (!xloadcolor(i, NULL, &dc.col[i])) {
  189. -			if (colorname[i])
  190. -				die("could not allocate color '%s'\n", colorname[i]);
  191. +			if (getcolorname(i))
  192. +				die("could not allocate color '%s'\n", getcolorname(i));
  193.  			else
  194.  				die("could not allocate color %d\n", i);
  195.  		}
  196. @@ -1108,13 +1124,13 @@ xinit(int cols, int rows)
  197.  	cursor = XCreateFontCursor(xw.dpy, mouseshape);
  198.  	XDefineCursor(xw.dpy, xw.win, cursor);
  199.  
  200. -	if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
  201. +	if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) == 0) {
  202.  		xmousefg.red   = 0xffff;
  203.  		xmousefg.green = 0xffff;
  204.  		xmousefg.blue  = 0xffff;
  205.  	}
  206.  
  207. -	if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
  208. +	if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousebg), &xmousebg) == 0) {
  209.  		xmousebg.red   = 0x0000;
  210.  		xmousebg.green = 0x0000;
  211.  		xmousebg.blue  = 0x0000;
  212. -- 
  213. 2.21.0