osama/st
1
0
Fork 0
mirror of https://github.com/mintycube/st.git synced 2024-09-20 02:55:55 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Addressing relativeborder plus ligatures combo conflict

Browse Source
This commit is contained in:
bakkeby 2021-03-29 10:27:10 +02:00
parent 636edb09c2
commit dbd1d6ece0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
st.h
View File

@ -311,9 +311,6 @@ void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int); void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
#endif // XFT_VERSION #endif // XFT_VERSION
#endif // BOXDRAW_PATCH #endif // BOXDRAW_PATCH
#if RELATIVEBORDER_PATCH
int borderpx;
#endif // RELATIVEBORDER_PATCH
/* config.h globals */ /* config.h globals */
extern char *utmp; extern char *utmp;
@ -339,4 +336,4 @@ extern DC dc;
extern XWindow xw; extern XWindow xw;
extern XSelection xsel; extern XSelection xsel;
extern TermWindow win; extern TermWindow win;
extern Term term; extern Term term;

7
x.c
View File

@ -189,6 +189,9 @@ static int oldbutton = 3; /* button event on startup: 3 = release */
#if VISUALBELL_1_PATCH #if VISUALBELL_1_PATCH
static int bellon = 0; /* visual bell status */ static int bellon = 0; /* visual bell status */
#endif // VISUALBELL_1_PATCH #endif // VISUALBELL_1_PATCH
#if RELATIVEBORDER_PATCH
int borderpx;
#endif // RELATIVEBORDER_PATCH
#include "patch/x_include.c" #include "patch/x_include.c"
@ -1999,10 +2002,6 @@ xfinishdraw(void)
GC gc; GC gc;
#endif // SIXEL_PATCH #endif // SIXEL_PATCH
#if VISUALBELL_3_PATCH
if (vbellmode == 3 && win.vbellset)
xdrawvbell();
#endif // VISUALBELL_3_PATCH
#if !SINGLE_DRAWABLE_BUFFER_PATCH #if !SINGLE_DRAWABLE_BUFFER_PATCH
XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
win.h, 0, 0); win.h, 0, 0);