Attachment #201931 for bug #235667

View | Details | Raw Unified | Return to bug 235667
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sterm	4	PORTNAME= sterm
5	DISTVERSION= 0.8.1	5	DISTVERSION= 0.8.2
6	CATEGORIES= x11	6	CATEGORIES= x11
7	MASTER_SITES= http://dl.suckless.org/st/	7	MASTER_SITES= http://dl.suckless.org/st/
8	DISTNAME= st-${PORTVERSION}	8	DISTNAME= st-${PORTVERSION}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1521664450	1	TIMESTAMP = 1549877374
2	SHA256 (st-0.8.1.tar.gz) = c4fb0fe2b8d2d3bd5e72763e80a8ae05b7d44dbac8f8e3bb18ef0161c7266926	2	SHA256 (st-0.8.2.tar.gz) = aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35
3	SIZE (st-0.8.1.tar.gz) = 45423	3	SIZE (st-0.8.2.tar.gz) = 44788

Lines 1-9 Link Here

(-)files/extra-scrollback-patch-config.def.h (-4 / +4 lines)
1	--- config.def.h.orig 2018-06-18 05:54:16 UTC	1	--- config.def.h.orig 2019-02-09 12:50:41.000000000 +0100
2	+++ config.def.h	2	+++ config.def.h 2019-02-11 14:03:37.626887000 +0100
3	@@ -178,6 +178,8 @@ static Shortcut shortcuts[] = {	3	@@ -178,6 +178,8 @@
4	{ TERMMOD, XK_Y, selpaste, {.i = 0} },	4	{ TERMMOD, XK_Y, selpaste, {.i = 0} },
		5	{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
5	{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },	6	{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
6	{ TERMMOD, XK_I, iso14755, {.i = 0} },
7	+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },	7	+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
8	+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },	8	+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
9	};	9	};




--- config.def.h.orig	2019-02-09 12:50:41.000000000 +0100
+++ config.def.h	2019-02-11 13:45:28.209172000 +0100
@@ -84,31 +84,44 @@
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {

 };
 
 
@@ -116,10 +129,10 @@
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */

 
 /*
  * Default shape of cursor
@@ -178,6 +191,7 @@
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
 	{ TERMMOD,              XK_I,           iso14755,       {.i =  0} },
+	{ XK_ANY_MOD,           XK_F6,          swapcolors,     {.i =  0} },
 };
 




--- x.c.orig	2019-02-09 12:50:41.000000000 +0100
+++ x.c	2019-02-11 14:02:22.026884000 +0100
@@ -53,6 +53,7 @@
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);

 static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
@@ -240,6 +241,8 @@
 
 static int oldbutton = 3; /* button event on startup: 3 = release */
 

 void
 clipcopy(const Arg *dummy)
 {
@@ -279,6 +282,14 @@
 }
 
 void

 zoom(const Arg *arg)
 {
 	Arg larg;
@@ -702,6 +713,11 @@
 	return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 

 int
 xloadcolor(int i, const char *name, Color *ncolor)
 {
@@ -720,7 +736,7 @@
 			return XftColorAllocValue(xw.dpy, xw.vis,
 			                          xw.cmap, &color, ncolor);
 		} else

 	}
 
 	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
@@ -737,14 +753,14 @@
 		for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
 			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
 	} else {
-		dc.collen = MAX(LEN(colorname), 256);
+		dc.collen = MAX(LEN(colorname), LEN(altcolorname));
 		dc.col = xmalloc(dc.collen * sizeof(Color));
 	}
 
-	dc.collen = MAX(LEN(colorname), 256);
+	dc.collen = MAX(LEN(colorname), LEN(altcolorname));
 	dc.col = xmalloc(dc.collen * sizeof(Color));
 
 	if (loaded) {
@@ -741,8 +757,8 @@ xloadcols(void)
 
 	for (i = 0; i < dc.collen; i++)
 		if (!xloadcolor(i, NULL, &dc.col[i])) {
-			if (colorname[i])
-				die("could not allocate color '%s'\n", colorname[i]);
+			if (getcolorname(i))
+				die("could not allocate color '%s'\n", getcolorname(i));
 			else
 				die("could not allocate color %d\n", i);
 		}
@@ -1082,13 +1098,13 @@
 	cursor = XCreateFontCursor(xw.dpy, mouseshape);
 	XDefineCursor(xw.dpy, xw.win, cursor);
 

 		xmousebg.red   = 0x0000;
 		xmousebg.green = 0x0000;
 		xmousebg.blue  = 0x0000;
@@ -1298,7 +1314,7 @@
 
 	/* Change basic system colors [0-7] to bright system colors [8-15] */
 	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))

Return to bug 235667

Lines 1-6 Link Here

(-)files/extra-solarized-patch-config.def.h (-6 / +6 lines)
1	--- config.def.h.orig 2018-03-20 20:29:59 UTC	1	--- config.def.h.orig 2019-02-09 12:50:41.000000000 +0100
2	+++ config.def.h	2	+++ config.def.h 2019-02-11 13:45:28.209172000 +0100
3	@@ -84,31 +84,44 @@ unsigned int tabspaces = 8;	3	@@ -84,31 +84,44 @@
4		4
5	/* Terminal colors (16 first used in escape sequence) */	5	/* Terminal colors (16 first used in escape sequence) */
6	static const char *colorname[] = {	6	static const char *colorname[] = {
Lines 70-76 Link Here
70	};	70	};
71		71
72		72
73	@@ -116,10 +129,10 @@ static const char *colorname[] = {	73	@@ -116,10 +129,10 @@
74	* Default colors (colorname index)	74	* Default colors (colorname index)
75	* foreground, background, cursor, reverse cursor	75	* foreground, background, cursor, reverse cursor
76	*/	76	*/
Lines 85-94 Link Here
85		85
86	/*	86	/*
87	* Default shape of cursor	87	* Default shape of cursor
88	@@ -178,6 +191,7 @@ static Shortcut shortcuts[] = {	88	@@ -178,6 +191,7 @@
89	{ TERMMOD, XK_Y, selpaste, {.i = 0} },	89	{ TERMMOD, XK_Y, selpaste, {.i = 0} },
		90	{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
90	{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },	91	{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
91	{ TERMMOD, XK_I, iso14755, {.i = 0} },
92	+ { XK_ANY_MOD, XK_F6, swapcolors, {.i = 0} },	92	+ { XK_ANY_MOD, XK_F6, swapcolors, {.i = 0} },
93	};	93	};
94		94

Lines 1-6 Link Here

(-)files/extra-solarized-patch-x.c (-22 / +20 lines)
1	--- x.c.orig 2018-03-20 20:29:59 UTC	1	--- x.c.orig 2019-02-09 12:50:41.000000000 +0100
2	+++ x.c	2	+++ x.c 2019-02-11 14:02:22.026884000 +0100
3	@@ -53,6 +53,7 @@ static void clipcopy(const Arg *);	3	@@ -53,6 +53,7 @@
4	static void clippaste(const Arg *);	4	static void clippaste(const Arg *);
5	static void numlock(const Arg *);	5	static void numlock(const Arg *);
6	static void selpaste(const Arg *);	6	static void selpaste(const Arg *);
Lines 8-14 Link Here
8	static void zoom(const Arg *);	8	static void zoom(const Arg *);
9	static void zoomabs(const Arg *);	9	static void zoomabs(const Arg *);
10	static void zoomreset(const Arg *);	10	static void zoomreset(const Arg *);
11	@@ -240,6 +241,8 @@ static char *opt_title = NULL;	11	@@ -240,6 +241,8 @@
12		12
13	static int oldbutton = 3; /* button event on startup: 3 = release */	13	static int oldbutton = 3; /* button event on startup: 3 = release */
14		14
Lines 17-23 Link Here
17	void	17	void
18	clipcopy(const Arg *dummy)	18	clipcopy(const Arg *dummy)
19	{	19	{
20	@@ -279,6 +282,14 @@ numlock(const Arg *dummy)	20	@@ -279,6 +282,14 @@
21	}	21	}
22		22
23	void	23	void
Lines 32-38 Link Here
32	zoom(const Arg *arg)	32	zoom(const Arg *arg)
33	{	33	{
34	Arg larg;	34	Arg larg;
35	@@ -700,6 +711,11 @@ sixd_to_16bit(int x)	35	@@ -702,6 +713,11 @@
36	return x == 0 ? 0 : 0x3737 + 0x2828 * x;	36	return x == 0 ? 0 : 0x3737 + 0x2828 * x;
37	}	37	}
38		38
Lines 44-50 Link Here
44	int	44	int
45	xloadcolor(int i, const char name, Color ncolor)	45	xloadcolor(int i, const char name, Color ncolor)
46	{	46	{
47	@@ -718,7 +734,7 @@ xloadcolor(int i, const char *name, Colo	47	@@ -720,7 +736,7 @@
48	return XftColorAllocValue(xw.dpy, xw.vis,	48	return XftColorAllocValue(xw.dpy, xw.vis,
49	xw.cmap, &color, ncolor);	49	xw.cmap, &color, ncolor);
50	} else	50	} else
Lines 53-79 Link Here
53	}	53	}
54		54
55	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);	55	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
56	@@ -731,7 +747,7 @@ xloadcols(void)	56	@@ -737,14 +753,14 @@
57	static int loaded;	57	for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
58	Color *cp;	58	XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
		59	} else {
		60	- dc.collen = MAX(LEN(colorname), 256);
		61	+ dc.collen = MAX(LEN(colorname), LEN(altcolorname));
		62	dc.col = xmalloc(dc.collen * sizeof(Color));
		63	}
59		64
60	- dc.collen = MAX(LEN(colorname), 256);
61	+ dc.collen = MAX(LEN(colorname), LEN(altcolorname));
62	dc.col = xmalloc(dc.collen * sizeof(Color));
63
64	if (loaded) {
65	@@ -741,8 +757,8 @@ xloadcols(void)
66
67	for (i = 0; i < dc.collen; i++)	65	for (i = 0; i < dc.collen; i++)
68	if (!xloadcolor(i, NULL, &dc.col[i])) {	66	if (!xloadcolor(i, NULL, &dc.col[i])) {
69	- if (colorname[i])	67	- if (colorname[i])
70	- die("Could not allocate color '%s'\n", colorname[i]);	68	- die("could not allocate color '%s'\n", colorname[i]);
71	+ if (getcolorname(i))	69	+ if (getcolorname(i))
72	+ die("Could not allocate color '%s'\n", getcolorname(i));	70	+ die("could not allocate color '%s'\n", getcolorname(i));
73	else	71	else
74	die("Could not allocate color %d\n", i);	72	die("could not allocate color %d\n", i);
75	}	73	}
76	@@ -1079,13 +1095,13 @@ xinit(int cols, int rows)	74	@@ -1082,13 +1098,13 @@
77	cursor = XCreateFontCursor(xw.dpy, mouseshape);	75	cursor = XCreateFontCursor(xw.dpy, mouseshape);
78	XDefineCursor(xw.dpy, xw.win, cursor);	76	XDefineCursor(xw.dpy, xw.win, cursor);
79		77
Lines 89-95 Link Here
89	xmousebg.red = 0x0000;	87	xmousebg.red = 0x0000;
90	xmousebg.green = 0x0000;	88	xmousebg.green = 0x0000;
91	xmousebg.blue = 0x0000;	89	xmousebg.blue = 0x0000;
92	@@ -1295,7 +1311,7 @@ xdrawglyphfontspecs(const XftGlyphFontSp	90	@@ -1298,7 +1314,7 @@
93		91
94	/* Change basic system colors [0-7] to bright system colors [8-15] */	92	/* Change basic system colors [0-7] to bright system colors [8-15] */
95	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))	93	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))