st-flexipatch

commit dbd1d6ece0e910eca249cd4eeee95439d3f6b97b
parent 636edb09c2dfe9f7216820b85e0cc1179b5ed2b7
Author: bakkeby <bakkeby@gmail.com>
Date:   Mon, 29 Mar 2021 10:27:10 +0200

Addressing relativeborder plus ligatures combo conflict

Diffstat:
M
st.h
 | 
6
+-----
M
x.c
 | 
7
+++----

2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/st.h b/st.h
@@ -311,9 +311,6 @@ void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
 void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
 #endif // XFT_VERSION
 #endif // BOXDRAW_PATCH
-#if RELATIVEBORDER_PATCH
-int borderpx;
-#endif // RELATIVEBORDER_PATCH
 
 /* config.h globals */
 extern char *utmp;
@@ -339,4 +336,4 @@ extern DC dc;
 extern XWindow xw;
 extern XSelection xsel;
 extern TermWindow win;
-extern Term term;
-\ No newline at end of file
+extern Term term;
diff --git a/x.c b/x.c
@@ -189,6 +189,9 @@ static int oldbutton = 3; /* button event on startup: 3 = release */
 #if VISUALBELL_1_PATCH
 static int bellon = 0;    /* visual bell status */
 #endif // VISUALBELL_1_PATCH
+#if RELATIVEBORDER_PATCH
+int borderpx;
+#endif // RELATIVEBORDER_PATCH
 
 #include "patch/x_include.c"
 
@@ -1999,10 +2002,6 @@ xfinishdraw(void)
 	GC gc;
 	#endif // SIXEL_PATCH
 
-	#if VISUALBELL_3_PATCH
-	if (vbellmode == 3 && win.vbellset)
-		xdrawvbell();
-	#endif // VISUALBELL_3_PATCH
 	#if !SINGLE_DRAWABLE_BUFFER_PATCH
 	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
 			win.h, 0, 0);