a
/
st
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
st/x.c

3913 lines
96 KiB
C
Raw Normal View History

Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* See LICENSE for license details. */
#include <errno.h>
#include <math.h>
#include <limits.h>
#include <locale.h>
#include <signal.h>
#include <sys/select.h>
#include <time.h>
#include <unistd.h>
#include <libgen.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xft/Xft.h>
#include <X11/XKBlib.h>
make argv0 not static, fixes a warning with tcc (fcd339)
2020-04-10 11:57:14 +00:00
char *argv0;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
#include "arg.h"
#include "st.h"
#include "win.h"
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#if LIGATURES_PATCH
#include "hb.h"
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#if THEMED_CURSOR_PATCH
#include <X11/Xcursor/Xcursor.h>
#endif // THEMED_CURSOR_PATCH
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
#if SIXEL_PATCH
#include <Imlib2.h>
#include "sixel.h"
#endif // SIXEL_PATCH
undercurl: upgrading patch with curly, spiky and capped options Ref. https://git.suckless.org/sites/commit/9bb304a974185cbd9fa48c890450c6582d3e0546.html
2021-08-22 16:35:31 +00:00
#if UNDERCURL_PATCH
/* Undercurl slope types */
enum undercurl_slope_type {
UNDERCURL_SLOPE_ASCENDING = 0,
UNDERCURL_SLOPE_TOP_CAP = 1,
UNDERCURL_SLOPE_DESCENDING = 2,
UNDERCURL_SLOPE_BOTTOM_CAP = 3
};
#endif // UNDERCURL_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* X modifiers */
#define XK_ANY_MOD UINT_MAX
#define XK_NO_MOD 0
Add 14th bit to XK_SWITCH_MOD bitmask The bits of uint signal in an XKeyEvent which concern the key group (keyboard layout) are bits 13 and 14, as documented here: https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Groups_and_Shift_Levels In the older version, only bit 13 was marked as part of XK_SWITCH_MOD, this causes issues for users who have more than two keymaps. The 14th bit is not in ignoremod, key sequences are not caught by match(), if they switch to a third or fourth keyboard.
2021-07-18 16:17:17 +00:00
#define XK_SWITCH_MOD (1<<13|1<<14)
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* function definitions used in config.h */
static void clipcopy(const Arg *);
static void clippaste(const Arg *);
static void numlock(const Arg *);
static void selpaste(const Arg *);
mouse shortcuts: allow same functions as kb shortcuts (410651)
2020-03-24 13:02:07 +00:00
static void ttysend(const Arg *);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void zoom(const Arg *);
static void zoomabs(const Arg *);
static void zoomreset(const Arg *);
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#include "patch/st_include.h"
#include "patch/x_include.h"
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* config.h for applying patches and the configuration. */
#include "config.h"
Adding the CSI 22, 23 patch
2021-08-18 08:07:42 +00:00
#if CSI_22_23_PATCH
/* size of title stack */
#define TITLESTACKSIZE 8
#endif // CSI_22_23_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* XEMBED messages */
#define XEMBED_FOCUS_IN 4
#define XEMBED_FOCUS_OUT 5
/* macros */
#define IS_SET(flag) ((win.mode & (flag)) != 0)
#define TRUERED(x) (((x) & 0xff0000) >> 8)
#define TRUEGREEN(x) (((x) & 0xff00))
#define TRUEBLUE(x) (((x) & 0xff) << 8)
static inline ushort sixd_to_16bit(int);
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#if LIGATURES_PATCH && WIDE_GLYPHS_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int, int);
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#elif LIGATURES_PATCH || WIDE_GLYPHS_PATCH
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#endif // WIDE_GLYPHS_PATCH | LIGATURES_PATCH
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
#if LIGATURES_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
static inline void xresetfontsettings(uint32_t mode, Font **font, int *frcflags);
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
#endif // LIGATURES_PATCH
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
void xdrawglyph(Glyph, int, int);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void xclear(int, int, int, int);
static int xgeommasktogravity(int);
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
static int ximopen(Display *);
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
static void ximinstantiate(Display *, XPointer, XPointer);
static void ximdestroy(XIM, XPointer, XPointer);
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
static int xicdestroy(XIC, XPointer, XPointer);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void xinit(int, int);
static void cresize(int, int);
static void xresize(int, int);
static void xhints(void);
static int xloadcolor(int, const char *, Color *);
static int xloadfont(Font *, FcPattern *);
Mild const-correctness improvements. Only touch a few things, the main focus is to improve code readability. https://git.suckless.org/st/commit/4536f46cfff50c66a115755def0155d8e246b02f.html
2021-05-10 07:35:50 +00:00
static void xloadfonts(const char *, double);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void xseturgency(int);
static int evcol(XEvent *);
static int evrow(XEvent *);
static void expose(XEvent *);
static void visibility(XEvent *);
static void unmap(XEvent *);
static void kpress(XEvent *);
static void cmessage(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
[st] mouseshortcuts: fix custom modifier on release (4c84ac4)
2020-04-02 14:23:53 +00:00
static uint buttonmask(uint);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void brelease(XEvent *);
static void bpress(XEvent *);
static void bmotion(XEvent *);
static void propnotify(XEvent *);
static void selnotify(XEvent *);
static void selclear_(XEvent *);
static void selrequest(XEvent *);
static void setsel(char *, Time);
Adding background image reload patch ref. pull request #62
2022-04-11 13:56:12 +00:00
#if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH || BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH
static void sigusr1_reload(int sig);
#endif // XRESOURCES_RELOAD_PATCH | BACKGROUND_IMAGE_RELOAD_PATCH
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
static int mouseaction(XEvent *, uint);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static void mousesel(XEvent *, int);
static void mousereport(XEvent *);
static char *kmap(KeySym, uint);
static int match(uint, uint);
static void run(void);
static void usage(void);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
[ClientMessage] = cmessage,
[ConfigureNotify] = resize,
[VisibilityNotify] = visibility,
[UnmapNotify] = unmap,
[Expose] = expose,
[FocusIn] = focus,
[FocusOut] = focus,
[MotionNotify] = bmotion,
[ButtonPress] = bpress,
[ButtonRelease] = brelease,
/*
* Uncomment if you want the selection to disappear when you select something
* different in another window.
*/
/* [SelectionClear] = selclear_, */
[SelectionNotify] = selnotify,
/*
* PropertyNotify is only turned on when there is some INCR transfer happening
* for the selection retrieval.
*/
[PropertyNotify] = propnotify,
[SelectionRequest] = selrequest,
Adding st embedder patch
2020-01-07 07:05:00 +00:00
#if ST_EMBEDDER_PATCH
[CreateNotify] = createnotify,
[DestroyNotify] = destroynotify,
#endif // ST_EMBEDDER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
};
/* Globals */
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
Term term;
DC dc;
XWindow xw;
XSelection xsel;
TermWindow win;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding the CSI 22, 23 patch
2021-08-18 08:07:42 +00:00
#if CSI_22_23_PATCH
static int tstki; /* title stack index */
static char *titlestack[TITLESTACKSIZE]; /* title stack */
#endif // CSI_22_23_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Font Ring Cache */
enum {
FRC_NORMAL,
FRC_ITALIC,
FRC_BOLD,
FRC_ITALICBOLD
};
typedef struct {
XftFont *font;
int flags;
Rune unicodep;
} Fontcache;
/* Fontcache is an array now. A new font will be appended to the array. */
Adding font2 patch as per request #3
2020-03-21 15:41:43 +00:00
static Fontcache *frc = NULL;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static int frclen = 0;
Adding font2 patch as per request #3
2020-03-21 15:41:43 +00:00
static int frccap = 0;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
static char *usedfont = NULL;
static double usedfontsize = 0;
static double defaultfontsize = 0;
#if ALPHA_PATCH
static char *opt_alpha = NULL;
#endif // ALPHA_PATCH
static char *opt_class = NULL;
static char **opt_cmd = NULL;
static char *opt_embed = NULL;
static char *opt_font = NULL;
static char *opt_io = NULL;
static char *opt_line = NULL;
static char *opt_name = NULL;
static char *opt_title = NULL;
Adding workingdir patch
2020-03-29 14:46:38 +00:00
#if WORKINGDIR_PATCH
static char *opt_dir = NULL;
#endif // WORKINGDIR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
static int focused = 0;
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
static uint buttons; /* bit field of pressed buttons */
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
static int cursorblinks = 0;
#endif // BLINKING_CURSOR_PATCH
Re-added visualbell patch
2020-08-08 16:09:00 +00:00
#if VISUALBELL_1_PATCH
static int bellon = 0; /* visual bell status */
#endif // VISUALBELL_1_PATCH
Addressing relativeborder plus ligatures combo conflict
2021-03-29 08:27:10 +00:00
#if RELATIVEBORDER_PATCH
int borderpx;
#endif // RELATIVEBORDER_PATCH
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#if SWAPMOUSE_PATCH
static Cursor cursor;
static XColor xmousefg, xmousebg;
#endif // SWAPMOUSE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#include "patch/x_include.c"
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
clipcopy(const Arg *dummy)
{
Atom clipboard;
free(xsel.clipboard);
xsel.clipboard = NULL;
if (xsel.primary != NULL) {
xsel.clipboard = xstrdup(xsel.primary);
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
}
}
void
clippaste(const Arg *dummy)
{
Atom clipboard;
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (IS_SET(MODE_KBDSELECT) && !kbds_issearchmode())
return;
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
xw.win, CurrentTime);
}
mouse shortcuts: allow same functions as kb shortcuts (410651)
2020-03-24 13:02:07 +00:00
void
numlock(const Arg *dummy)
{
win.mode ^= MODE_NUMLOCK;
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
selpaste(const Arg *dummy)
{
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (IS_SET(MODE_KBDSELECT) && !kbds_issearchmode())
return;
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
xw.win, CurrentTime);
}
void
mouse shortcuts: allow same functions as kb shortcuts (410651)
2020-03-24 13:02:07 +00:00
ttysend(const Arg *arg)
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
{
mouse shortcuts: allow same functions as kb shortcuts (410651)
2020-03-24 13:02:07 +00:00
ttywrite(arg->s, strlen(arg->s), 1);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
void
zoom(const Arg *arg)
{
Arg larg;
larg.f = usedfontsize + arg->f;
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
#if SIXEL_PATCH
if (larg.f >= 1.0)
zoomabs(&larg);
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
zoomabs(&larg);
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
#endif // SIXEL_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
void
zoomabs(const Arg *arg)
{
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
#if SIXEL_PATCH
ImageList *im;
#endif // SIXEL_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xunloadfonts();
xloadfonts(usedfont, arg->f);
Adding font2 patch as per request #3
2020-03-21 15:41:43 +00:00
#if FONT2_PATCH
xloadsparefonts();
#endif // FONT2_PATCH
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
#if SIXEL_PATCH
/* deleting old pixmaps forces the new scaled pixmaps to be created */
for (im = term.images; im; im = im->next) {
if (im->pixmap)
XFreePixmap(xw.dpy, (Drawable)im->pixmap);
im->pixmap = NULL;
}
#endif // SIXEL_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
cresize(0, 0);
redraw();
xhints();
}
void
zoomreset(const Arg *arg)
{
Arg larg;
if (defaultfontsize > 0) {
larg.f = defaultfontsize;
zoomabs(&larg);
}
}
int
evcol(XEvent *e)
{
#if ANYSIZE_PATCH
int x = e->xbutton.x - win.hborderpx;
#else
int x = e->xbutton.x - borderpx;
#endif // ANYSIZE_PATCH
LIMIT(x, 0, win.tw - 1);
return x / win.cw;
}
int
evrow(XEvent *e)
{
#if ANYSIZE_PATCH
int y = e->xbutton.y - win.vborderpx;
#else
int y = e->xbutton.y - borderpx;
#endif // ANYSIZE_PATCH
LIMIT(y, 0, win.th - 1);
return y / win.ch;
}
[st] mouseshortcuts: fix custom modifier on release (4c84ac4)
2020-04-02 14:23:53 +00:00
uint
buttonmask(uint button)
{
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
return button == Button1 ? Button1Mask
: button == Button2 ? Button2Mask
: button == Button3 ? Button3Mask
: button == Button4 ? Button4Mask
: button == Button5 ? Button5Mask
: 0;
[st] mouseshortcuts: fix custom modifier on release (4c84ac4)
2020-04-02 14:23:53 +00:00
}
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
int
mouseaction(XEvent *e, uint release)
{
MouseShortcut *ms;
Adding key and mouse binding option to control whether they apply to primary screen, alt screen or both ref. #81
2022-09-01 20:01:20 +00:00
int screen = tisaltscr() ? S_ALT : S_PRI;
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
[st] mouseshortcuts: fix custom modifier on release (4c84ac4)
2020-04-02 14:23:53 +00:00
/* ignore Button<N>mask for Button<N> - it's set on release */
uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
if (ms->release == release &&
mouse shortcuts: allow using forcemousemod (e.g. shift) (4c7150)
2020-03-24 13:16:02 +00:00
ms->button == e->xbutton.button &&
Adding key and mouse binding option to control whether they apply to primary screen, alt screen or both ref. #81
2022-09-01 20:01:20 +00:00
(!ms->screen || (ms->screen == screen)) &&
[st] mouseshortcuts: fix custom modifier on release (4c84ac4)
2020-04-02 14:23:53 +00:00
(match(ms->mod, state) || /* exact or forced */
match(ms->mod, state & ~forcemousemod))) {
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
ms->func(&(ms->arg));
return 1;
}
}
return 0;
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
mousesel(XEvent *e, int done)
{
int type, seltype = SEL_REGULAR;
mouse shortcuts: allow override for all shortcuts (7729e7)
2020-03-24 13:08:08 +00:00
uint state = e->xbutton.state & ~(Button1Mask | forcemousemod);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (kbds_isselectmode())
return;
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
for (type = 1; type < LEN(selmasks); ++type) {
if (match(selmasks[type], state)) {
seltype = type;
break;
}
}
selextend(evcol(e), evrow(e), seltype, done);
if (done)
setsel(getsel(), e->xbutton.time);
}
void
mousereport(XEvent *e)
{
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
int len, btn, code;
int x = evcol(e), y = evrow(e);
int state = e->xbutton.state;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
char buf[40];
static int ox, oy;
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
if (e->type == MotionNotify) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (x == ox && y == oy)
return;
if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
return;
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
/* MODE_MOUSEMOTION: no reporting if no button is pressed */
if (IS_SET(MODE_MOUSEMOTION) && buttons == 0)
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return;
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
/* Set btn to lowest-numbered pressed button, or 12 if no
* buttons are pressed. */
for (btn = 1; btn <= 11 && !(buttons & (1<<(btn-1))); btn++)
;
code = 32;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
} else {
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
btn = e->xbutton.button;
/* Only buttons 1 through 11 can be encoded */
if (btn < 1 || btn > 11)
return;
if (e->type == ButtonRelease) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* MODE_MOUSEX10: no button release reporting */
if (IS_SET(MODE_MOUSEX10))
return;
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
/* Don't send release events for the scroll wheel */
if (btn == 4 || btn == 5)
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return;
}
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
code = 0;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
ox = x;
oy = y;
/* Encode btn into code. If no button is pressed for a motion event in
* MODE_MOUSEMANY, then encode it as a release. */
if ((!IS_SET(MODE_MOUSESGR) && e->type == ButtonRelease) || btn == 12)
code += 3;
else if (btn >= 8)
code += 128 + btn - 8;
else if (btn >= 4)
code += 64 + btn - 4;
else
code += btn - 1;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (!IS_SET(MODE_MOUSEX10)) {
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
code += ((state & ShiftMask ) ? 4 : 0)
X10/SGR mouse: use alt as meta key instead of super/windows key Ref. - https://git.suckless.org/st/commit/2c5edf28ec851907305d73c6218ce75d39f1767f.html
2022-02-24 12:39:56 +00:00
+ ((state & Mod1Mask ) ? 8 : 0) /* meta key: alt */
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
+ ((state & ControlMask) ? 16 : 0);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
if (IS_SET(MODE_MOUSESGR)) {
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
code, x+1, y+1,
e->type == ButtonRelease ? 'm' : 'M');
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
} else if (x < 223 && y < 223) {
len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
32+code, 32+x+1, 32+y+1);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
} else {
return;
}
ttywrite(buf, len, 0);
}
void
bpress(XEvent *e)
{
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
int btn = e->xbutton.button;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
struct timespec now;
int snap;
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
if (1 <= btn && btn <= 11)
buttons |= 1 << (btn-1);
mouse shortcuts: allow override for all shortcuts (7729e7)
2020-03-24 13:08:08 +00:00
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
mousereport(e);
return;
}
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
if (mouseaction(e, 0))
return;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
if (btn == Button1) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/*
* If the user clicks below predefined timeouts specific
* snapping behaviour is exposed.
*/
clock_gettime(CLOCK_MONOTONIC, &now);
if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
snap = SNAP_LINE;
} else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
snap = SNAP_WORD;
} else {
snap = 0;
}
xsel.tclick2 = xsel.tclick1;
xsel.tclick1 = now;
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (kbds_isselectmode())
return;
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
selstart(evcol(e), evrow(e), snap);
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
clearurl();
url_click = 1;
#endif // OPENURLONCLICK_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
}
void
propnotify(XEvent *e)
{
XPropertyEvent *xpev;
Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
xpev = &e->xproperty;
if (xpev->state == PropertyNewValue &&
(xpev->atom == XA_PRIMARY ||
xpev->atom == clipboard)) {
selnotify(e);
}
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
if (pseudotransparency &&
!strncmp(XGetAtomName(xw.dpy, e->xproperty.atom), "_NET_WM_STATE", 13)) {
updatexy();
redraw();
}
#endif // BACKGROUND_IMAGE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
void
selnotify(XEvent *e)
{
ulong nitems, ofs, rem;
int format;
uchar *data, *last, *repl;
Atom type, incratom, property = None;
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
int append = 0;
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
incratom = XInternAtom(xw.dpy, "INCR", 0);
ofs = 0;
if (e->type == SelectionNotify)
property = e->xselection.property;
else if (e->type == PropertyNotify)
property = e->xproperty.atom;
if (property == None)
return;
do {
if (XGetWindowProperty(xw.dpy, xw.win, property, ofs,
BUFSIZ/4, False, AnyPropertyType,
&type, &format, &nitems, &rem,
&data)) {
fprintf(stderr, "Clipboard allocation failed\n");
return;
}
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
if (e->type == PropertyNotify && nitems == 0 && rem == 0 && !pseudotransparency)
#else
if (e->type == PropertyNotify && nitems == 0 && rem == 0)
#endif // BACKGROUND_IMAGE_PATCH
{
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/*
* If there is some PropertyNotify with no data, then
* this is the signal of the selection owner that all
* data has been transferred. We won't need to receive
* PropertyNotify events anymore.
*/
MODBIT(xw.attrs.event_mask, 0, PropertyChangeMask);
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
&xw.attrs);
}
if (type == incratom) {
/*
* Activate the PropertyNotify events so we receive
* when the selection owner does send us the next
* chunk of data.
*/
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
if (!pseudotransparency) {
#endif // BACKGROUND_IMAGE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask);
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
&xw.attrs);
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
}
#endif // BACKGROUND_IMAGE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/*
* Deleting the property is the transfer start signal.
*/
XDeleteProperty(xw.dpy, xw.win, (int)property);
continue;
}
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (IS_SET(MODE_KBDSELECT) && kbds_issearchmode()) {
kbds_pasteintosearch(data, nitems * format / 8, append++);
} else {
/*
* As seen in getsel:
* Line endings are inconsistent in the terminal and GUI world
* copy and pasting. When receiving some selection data,
* replace all '\n' with '\r'.
* FIXME: Fix the computer world.
*/
repl = data;
last = data + nitems * format / 8;
while ((repl = memchr(repl, '\n', last - repl))) {
*repl++ = '\r';
}
if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
ttywrite("\033[200~", 6, 0);
ttywrite((char *)data, nitems * format / 8, 1);
if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
ttywrite("\033[201~", 6, 0);
}
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/*
* As seen in getsel:
* Line endings are inconsistent in the terminal and GUI world
* copy and pasting. When receiving some selection data,
* replace all '\n' with '\r'.
* FIXME: Fix the computer world.
*/
repl = data;
last = data + nitems * format / 8;
while ((repl = memchr(repl, '\n', last - repl))) {
*repl++ = '\r';
}
if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
ttywrite("\033[200~", 6, 0);
ttywrite((char *)data, nitems * format / 8, 1);
if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
ttywrite("\033[201~", 6, 0);
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XFree(data);
/* number of 32-bit chunks returned */
ofs += nitems * format / 32;
} while (rem > 0);
/*
* Deleting the property again tells the selection owner to send the
* next data chunk in the property.
*/
XDeleteProperty(xw.dpy, xw.win, (int)property);
}
void
xclipcopy(void)
{
clipcopy(NULL);
}
void
selclear_(XEvent *e)
{
selclear();
}
void
selrequest(XEvent *e)
{
XSelectionRequestEvent *xsre;
XSelectionEvent xev;
Atom xa_targets, string, clipboard;
char *seltext;
xsre = (XSelectionRequestEvent *) e;
xev.type = SelectionNotify;
xev.requestor = xsre->requestor;
xev.selection = xsre->selection;
xev.target = xsre->target;
xev.time = xsre->time;
if (xsre->property == None)
xsre->property = xsre->target;
/* reject */
xev.property = None;
xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
if (xsre->target == xa_targets) {
/* respond with the supported type */
string = xsel.xtarget;
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
XA_ATOM, 32, PropModeReplace,
(uchar *) &string, 1);
xev.property = xsre->property;
} else if (xsre->target == xsel.xtarget || xsre->target == XA_STRING) {
/*
* xith XA_STRING non ascii characters may be incorrect in the
* requestor. It is not our problem, use utf8.
*/
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
if (xsre->selection == XA_PRIMARY) {
seltext = xsel.primary;
} else if (xsre->selection == clipboard) {
seltext = xsel.clipboard;
} else {
fprintf(stderr,
"Unhandled clipboard selection 0x%lx\n",
xsre->selection);
return;
}
if (seltext != NULL) {
XChangeProperty(xsre->display, xsre->requestor,
xsre->property, xsre->target,
8, PropModeReplace,
(uchar *)seltext, strlen(seltext));
xev.property = xsre->property;
}
}
/* all done, send a notification to the listener */
if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev))
fprintf(stderr, "Error sending SelectionNotify event\n");
}
void
setsel(char *str, Time t)
{
if (!str)
return;
free(xsel.primary);
xsel.primary = str;
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
selclear();
Adding clipboard patch
2019-09-16 07:51:41 +00:00
#if CLIPBOARD_PATCH
clipcopy(NULL);
#endif // CLIPBOARD_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Adding background image reload patch ref. pull request #62
2022-04-11 13:56:12 +00:00
#if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH || BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH
void
sigusr1_reload(int sig)
{
#if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH
reload_config(sig);
#endif // XRESOURCES_RELOAD_PATCH
#if BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH
reload_image();
#endif // BACKGROUND_IMAGE_RELOAD_PATCH
signal(SIGUSR1, sigusr1_reload);
}
#endif // XRESOURCES_RELOAD_PATCH | BACKGROUND_IMAGE_RELOAD_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
xsetsel(char *str)
{
setsel(str, CurrentTime);
}
void
brelease(XEvent *e)
{
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
int btn = e->xbutton.button;
if (1 <= btn && btn <= 11)
buttons &= ~(1 << (btn-1));
mouse shortcuts: allow override for all shortcuts (7729e7)
2020-03-24 13:08:08 +00:00
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
mousereport(e);
return;
}
mouse shortcuts: don't hardcode selpaste (ff828c)
2020-03-24 13:14:10 +00:00
if (mouseaction(e, 1))
return;
Removing the VIM browse patch. The general reasoning is that the vim browse patch is very invasive, has a high level of complexity, and is incompatible with a significant number of other patches and it complicates further maintenance. Additionally the patch has its own scrollback mechanism which seemingly did not work properly - and nobody seems to have complained about this since the patch was added back in May 2021. If you want to try out the vim browse patch then I would recommend having a play around with the patch author's own build that has this patch integrated: - https://github.com/juliusHuelsmann/st-history-vim - https://github.com/juliusHuelsmann/st Alternatively a tag has been added to this repository that refers to the last commit that still has the vim browse patch: - https://github.com/bakkeby/st-flexipatch/tree/VIM_BROWSE_PATCH
2024-03-07 21:35:11 +00:00
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
if (btn == Button1) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
mousesel(e, 1);
Adding openurlonclick patch ref. #32
2021-07-07 08:08:43 +00:00
#if OPENURLONCLICK_PATCH
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
if (url_click && e->xkey.state & url_opener_modkey)
openUrlOnClick(evcol(e), evrow(e), url_opener);
Adding openurlonclick patch ref. #32
2021-07-07 08:08:43 +00:00
#endif // OPENURLONCLICK_PATCH
}
Removing the VIM browse patch. The general reasoning is that the vim browse patch is very invasive, has a high level of complexity, and is incompatible with a significant number of other patches and it complicates further maintenance. Additionally the patch has its own scrollback mechanism which seemingly did not work properly - and nobody seems to have complained about this since the patch was added back in May 2021. If you want to try out the vim browse patch then I would recommend having a play around with the patch author's own build that has this patch integrated: - https://github.com/juliusHuelsmann/st-history-vim - https://github.com/juliusHuelsmann/st Alternatively a tag has been added to this repository that refers to the last commit that still has the vim browse patch: - https://github.com/bakkeby/st-flexipatch/tree/VIM_BROWSE_PATCH
2024-03-07 21:35:11 +00:00
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#if RIGHTCLICKTOPLUMB_PATCH
Fix mousereport This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses. Ref. - https://git.suckless.org/st/commit/ea7cd7b62fdfa6a1fbd882d1565d557577f2cf32.html
2022-02-24 12:38:01 +00:00
else if (btn == Button3)
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
plumb(xsel.primary);
#endif // RIGHTCLICKTOPLUMB_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
void
bmotion(XEvent *e)
{
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#if HIDECURSOR_PATCH
if (!xw.pointerisvisible) {
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#if SWAPMOUSE_PATCH
if (win.mode & MODE_MOUSE)
XUndefineCursor(xw.dpy, xw.win);
else
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
#else
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#endif // SWAPMOUSE_PATCH
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
xw.pointerisvisible = 1;
if (!IS_SET(MODE_MOUSEMANY))
xsetpointermotion(0);
}
#endif // HIDECURSOR_PATCH
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
if (!IS_SET(MODE_MOUSE)) {
if (!(e->xbutton.state & Button1Mask) && detecturl(evcol(e), evrow(e), 1))
XDefineCursor(xw.dpy, xw.win, xw.upointer);
else
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
}
url_click = 0;
#endif // OPENURLONCLICK_PATCH
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
mouse shortcuts: allow override for all shortcuts (7729e7)
2020-03-24 13:08:08 +00:00
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
mousereport(e);
return;
}
mousesel(e, 0);
}
void
cresize(int width, int height)
{
int col, row;
if (width != 0)
win.w = width;
if (height != 0)
win.h = height;
col = (win.w - 2 * borderpx) / win.cw;
row = (win.h - 2 * borderpx) / win.ch;
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
col = MAX(2, col);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
row = MAX(1, row);
#if ANYSIZE_PATCH
win.hborderpx = (win.w - col * win.cw) / 2;
win.vborderpx = (win.h - row * win.ch) / 2;
#endif // ANYSIZE_PATCH
tresize(col, row);
xresize(col, row);
ttyresize(win.tw, win.th);
}
void
xresize(int col, int row)
{
win.tw = col * win.cw;
win.th = row * win.ch;
Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
2020-06-26 13:01:30 +00:00
#if !SINGLE_DRAWABLE_BUFFER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XFreePixmap(xw.dpy, xw.buf);
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if ALPHA_PATCH
xw.depth
#else
DefaultDepth(xw.dpy, xw.scr)
#endif // ALPHA_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
);
XftDrawChange(xw.draw, xw.buf);
Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
2020-06-26 13:01:30 +00:00
#endif // SINGLE_DRAWABLE_BUFFER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xclear(0, 0, win.w, win.h);
/* resize to new width */
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#if LIGATURES_PATCH
xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec) * 4);
xw.specseq = xrealloc(xw.specseq, col * sizeof(GlyphFontSeq));
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
ushort
sixd_to_16bit(int x)
{
return x == 0 ? 0 : 0x3737 + 0x2828 * x;
}
int
xloadcolor(int i, const char *name, Color *ncolor)
{
XRenderColor color = { .alpha = 0xffff };
if (!name) {
if (BETWEEN(i, 16, 255)) { /* 256 color */
if (i < 6*6*6+16) { /* same colors as xterm */
color.red = sixd_to_16bit( ((i-16)/36)%6 );
color.green = sixd_to_16bit( ((i-16)/6) %6 );
color.blue = sixd_to_16bit( ((i-16)/1) %6 );
} else { /* greyscale */
color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16));
color.green = color.blue = color.red;
}
return XftColorAllocValue(xw.dpy, xw.vis,
xw.cmap, &color, ncolor);
} else
name = colorname[i];
}
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
}
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
void
xloadalpha(void)
{
float const usedAlpha = focused ? alpha : alphaUnfocused;
if (opt_alpha) alpha = strtof(opt_alpha, NULL);
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha);
dc.col[defaultbg].pixel &= 0x00FFFFFF;
dc.col[defaultbg].pixel |= (unsigned char)(0xff * usedAlpha) << 24;
}
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
void
xloadcols(void)
{
static int loaded;
Color *cp;
if (!loaded) {
dc.collen = 1 + (defaultbg = MAX(LEN(colorname), 256));
dc.col = xmalloc((dc.collen) * sizeof(Color));
}
for (int i = 0; i+1 < dc.collen; ++i)
if (!xloadcolor(i, NULL, &dc.col[i])) {
if (colorname[i])
die("could not allocate color '%s'\n", colorname[i]);
else
die("could not allocate color %d\n", i);
}
if (dc.collen) // cannot die, as the color is already loaded.
xloadcolor(focused ? bg : bgUnfocused, NULL, &dc.col[defaultbg]);
xloadalpha();
loaded = 1;
}
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
xloadcols(void)
{
int i;
static int loaded;
Color *cp;
if (loaded) {
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.col = xmalloc(dc.collen * sizeof(Color));
}
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]);
else
die("could not allocate color %d\n", i);
}
#if ALPHA_PATCH
/* set alpha value of bg color */
if (opt_alpha)
alpha = strtof(opt_alpha, NULL);
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
dc.col[defaultbg].pixel &= 0x00FFFFFF;
dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
#endif // ALPHA_PATCH
loaded = 1;
}
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Add support for OSC color sequences Ref. - https://git.suckless.org/st/commit/8e310303903792c010d03c046ba75f8b18f7d3a7.html - https://git.suckless.org/st/commit/273db5ceaf392e68c2faf8f7dec14ea2e25e980d.html
2022-02-24 12:24:00 +00:00
int
xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b)
{
Fix bounds checks of dc.col dc.collen is the length of dc.col, not the maximum index, hence if x is equal to dc.collen, then it's an error. With config.def.h, the last valid index is 259, so this correctly reports "black": $ printf '\033]4;259;?\e\\' 260 is an invalid index and this reports garbage instead of printing an error: $ printf '\033]4;260;?\e\\' ref. https://git.suckless.org/st/commit/a6bbc0c96b0a1db804061b0db79101c6b26aec57.html
2023-10-08 18:18:30 +00:00
if (!BETWEEN(x, 0, dc.collen - 1))
Add support for OSC color sequences Ref. - https://git.suckless.org/st/commit/8e310303903792c010d03c046ba75f8b18f7d3a7.html - https://git.suckless.org/st/commit/273db5ceaf392e68c2faf8f7dec14ea2e25e980d.html
2022-02-24 12:24:00 +00:00
return 1;
*r = dc.col[x].color.red >> 8;
*g = dc.col[x].color.green >> 8;
*b = dc.col[x].color.blue >> 8;
return 0;
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
int
xsetcolorname(int x, const char *name)
{
Color ncolor;
Fix bounds checks of dc.col dc.collen is the length of dc.col, not the maximum index, hence if x is equal to dc.collen, then it's an error. With config.def.h, the last valid index is 259, so this correctly reports "black": $ printf '\033]4;259;?\e\\' 260 is an invalid index and this reports garbage instead of printing an error: $ printf '\033]4;260;?\e\\' ref. https://git.suckless.org/st/commit/a6bbc0c96b0a1db804061b0db79101c6b26aec57.html
2023-10-08 18:18:30 +00:00
if (!BETWEEN(x, 0, dc.collen - 1))
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return 1;
if (!xloadcolor(x, name, &ncolor))
return 1;
XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
dc.col[x] = ncolor;
Add alpha to background color from escape sequence
2021-04-22 18:49:05 +00:00
#if ALPHA_PATCH
/* set alpha value of bg color */
if (x == defaultbg) {
if (opt_alpha)
alpha = strtof(opt_alpha, NULL);
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
dc.col[defaultbg].pixel &= 0x00FFFFFF;
dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
}
#endif // ALPHA_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return 0;
}
/*
* Absolute coordinates.
*/
void
xclear(int x1, int y1, int x2, int y2)
{
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
if (pseudotransparency)
XSetTSOrigin(xw.dpy, xw.bggc, -win.x, -win.y);
XFillRectangle(xw.dpy, xw.buf, xw.bggc, x1, y1, x2-x1, y2-y1);
#elif INVERT_PATCH
Adding invert patch
2020-03-29 13:38:16 +00:00
Color c;
c = dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg];
if (invertcolors) {
c = invertedcolor(&c);
}
XftDrawRect(xw.draw, &c, x1, y1, x2-x1, y2-y1);
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XftDrawRect(xw.draw,
&dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
x1, y1, x2-x1, y2-y1);
Adding invert patch
2020-03-29 13:38:16 +00:00
#endif // INVERT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Added the force redraw on keypress patch
2020-04-20 10:14:49 +00:00
void
xclearwin(void)
{
xclear(0, 0, win.w, win.h);
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
xhints(void)
{
Adding xresources patch
2019-09-16 12:21:09 +00:00
#if XRESOURCES_PATCH
XClassHint class = {opt_name ? opt_name : "st",
opt_class ? opt_class : "St"};
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XClassHint class = {opt_name ? opt_name : termname,
opt_class ? opt_class : termname};
Adding xresources patch
2019-09-16 12:21:09 +00:00
#endif // XRESOURCES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints *sizeh;
sizeh = XAllocSizeHints();
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
sizeh->height = win.h;
sizeh->width = win.w;
Adding simple version of the anysize patch ref. #35
2021-07-29 10:22:44 +00:00
#if ANYSIZE_PATCH || ANYSIZE_SIMPLE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
sizeh->height_inc = 1;
sizeh->width_inc = 1;
#else
sizeh->height_inc = win.ch;
sizeh->width_inc = win.cw;
#endif // ANYSIZE_PATCH
sizeh->base_height = 2 * borderpx;
sizeh->base_width = 2 * borderpx;
sizeh->min_height = win.ch + 2 * borderpx;
sizeh->min_width = win.cw + 2 * borderpx;
if (xw.isfixed) {
sizeh->flags |= PMaxSize;
sizeh->min_width = sizeh->max_width = win.w;
sizeh->min_height = sizeh->max_height = win.h;
}
if (xw.gm & (XValue|YValue)) {
sizeh->flags |= USPosition | PWinGravity;
sizeh->x = xw.l;
sizeh->y = xw.t;
sizeh->win_gravity = xgeommasktogravity(xw.gm);
}
XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
&class);
XFree(sizeh);
}
int
xgeommasktogravity(int mask)
{
switch (mask & (XNegative|YNegative)) {
case 0:
return NorthWestGravity;
case XNegative:
return NorthEastGravity;
case YNegative:
return SouthWestGravity;
}
return SouthEastGravity;
}
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
int
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
ximopen(Display *dpy)
{
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
XIMCallback imdestroy = { .client_data = NULL, .callback = ximdestroy };
XICCallback icdestroy = { .client_data = NULL, .callback = xicdestroy };
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
xw.ime.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
if (xw.ime.xim == NULL)
return 0;
if (XSetIMValues(xw.ime.xim, XNDestroyCallback, &imdestroy, NULL))
fprintf(stderr, "XSetIMValues: "
"Could not set XNDestroyCallback.\n");
x: do not instantiate a new nested list on each cursor move (b67c9b)
2020-03-24 14:36:22 +00:00
xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot,
NULL);
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
if (xw.ime.xic == NULL) {
xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle,
XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, xw.win,
XNDestroyCallback, &icdestroy,
NULL);
}
if (xw.ime.xic == NULL)
fprintf(stderr, "XCreateIC: Could not create input context.\n");
return 1;
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
}
void
ximinstantiate(Display *dpy, XPointer client, XPointer call)
{
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
if (ximopen(dpy))
XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
ximinstantiate, NULL);
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
}
void
ximdestroy(XIM xim, XPointer client, XPointer call)
{
x: move IME variables into XWindow ime embedded struct (2f6ef4)
2020-03-24 14:34:12 +00:00
xw.ime.xim = NULL;
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
ximinstantiate, NULL);
XFree(xw.ime.spotlist);
}
int
xicdestroy(XIC xim, XPointer client, XPointer call)
{
xw.ime.xic = NULL;
return 1;
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
int
xloadfont(Font *f, FcPattern *pattern)
{
FcPattern *configured;
FcPattern *match;
FcResult result;
XGlyphInfo extents;
int wantattr, haveattr;
/*
* Manually configure instead of calling XftMatchFont
* so that we can use the configured pattern for
* "missing glyph" lookups.
*/
configured = FcPatternDuplicate(pattern);
if (!configured)
return 1;
FcConfigSubstitute(NULL, configured, FcMatchPattern);
XftDefaultSubstitute(xw.dpy, xw.scr, configured);
Adding use XftFontMatch patch
2022-08-28 19:05:55 +00:00
#if USE_XFTFONTMATCH_PATCH
match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
match = FcFontMatch(NULL, configured, &result);
Adding use XftFontMatch patch
2022-08-28 19:05:55 +00:00
#endif // USE_XFTFONTMATCH_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (!match) {
FcPatternDestroy(configured);
return 1;
}
if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(configured);
FcPatternDestroy(match);
return 1;
}
if ((XftPatternGetInteger(pattern, "slant", 0, &wantattr) ==
XftResultMatch)) {
/*
* Check if xft was unable to find a font with the appropriate
* slant but gave us one anyway. Try to mitigate.
*/
if ((XftPatternGetInteger(f->match->pattern, "slant", 0,
&haveattr) != XftResultMatch) || haveattr < wantattr) {
f->badslant = 1;
fputs("font slant does not match\n", stderr);
}
}
if ((XftPatternGetInteger(pattern, "weight", 0, &wantattr) ==
XftResultMatch)) {
if ((XftPatternGetInteger(f->match->pattern, "weight", 0,
&haveattr) != XftResultMatch) || haveattr != wantattr) {
f->badweight = 1;
fputs("font weight does not match\n", stderr);
}
}
XftTextExtentsUtf8(xw.dpy, f->match,
(const FcChar8 *) ascii_printable,
strlen(ascii_printable), &extents);
f->set = NULL;
f->pattern = configured;
f->ascent = f->match->ascent;
f->descent = f->match->descent;
f->lbearing = 0;
f->rbearing = f->match->max_advance_width;
f->height = f->ascent + f->descent;
Adding workaround for Variable Fonts causing too wide letter spacing
2021-04-21 13:48:31 +00:00
#if WIDE_GLYPH_SPACING_PATCH
f->width = DIVCEIL(extents.xOff > 18 ? extents.xOff / 3 : extents.xOff, strlen(ascii_printable));
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
f->width = DIVCEIL(extents.xOff, strlen(ascii_printable));
Proposed fix for wide glyphs ref. #26
2021-05-15 07:16:51 +00:00
#endif // WIDE_GLYPH_SPACING_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return 0;
}
void
Mild const-correctness improvements. Only touch a few things, the main focus is to improve code readability. https://git.suckless.org/st/commit/4536f46cfff50c66a115755def0155d8e246b02f.html
2021-05-10 07:35:50 +00:00
xloadfonts(const char *fontstr, double fontsize)
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
{
FcPattern *pattern;
double fontval;
if (fontstr[0] == '-')
pattern = XftXlfdParse(fontstr, False, False);
else
Mild const-correctness improvements. Only touch a few things, the main focus is to improve code readability. https://git.suckless.org/st/commit/4536f46cfff50c66a115755def0155d8e246b02f.html
2021-05-10 07:35:50 +00:00
pattern = FcNameParse((const FcChar8 *)fontstr);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (!pattern)
die("can't open font %s\n", fontstr);
if (fontsize > 1) {
FcPatternDel(pattern, FC_PIXEL_SIZE);
FcPatternDel(pattern, FC_SIZE);
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
usedfontsize = fontsize;
} else {
if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
FcResultMatch) {
usedfontsize = fontval;
} else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
FcResultMatch) {
usedfontsize = -1;
} else {
/*
* Default font size is 12, if none given. This is to
* have a known usedfontsize value.
*/
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
usedfontsize = 12;
}
defaultfontsize = usedfontsize;
}
if (xloadfont(&dc.font, pattern))
die("can't open font %s\n", fontstr);
if (usedfontsize < 0) {
FcPatternGetDouble(dc.font.match->pattern,
FC_PIXEL_SIZE, 0, &fontval);
usedfontsize = fontval;
if (fontsize == 0)
defaultfontsize = fontval;
}
/* Setting character width and height. */
win.cw = ceilf(dc.font.width * cwscale);
win.ch = ceilf(dc.font.height * chscale);
Adding scrollback patch
2019-09-16 13:31:58 +00:00
#if VERTCENTER_PATCH
win.cyo = ceilf(dc.font.height * (chscale - 1) / 2);
#endif // VERTCENTER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#if RELATIVEBORDER_PATCH
borderpx = (int) ceilf(((float)borderperc / 100) * win.cw);
#endif // RELATIVEBORDER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FcPatternDel(pattern, FC_SLANT);
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
#if !DISABLE_ITALIC_FONTS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
#endif // DISABLE_ITALIC_FONTS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (xloadfont(&dc.ifont, pattern))
die("can't open font %s\n", fontstr);
FcPatternDel(pattern, FC_WEIGHT);
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
#if !DISABLE_BOLD_FONTS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
#endif // DISABLE_BOLD_FONTS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (xloadfont(&dc.ibfont, pattern))
die("can't open font %s\n", fontstr);
FcPatternDel(pattern, FC_SLANT);
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
#if !DISABLE_ROMAN_FONTS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
Adding copyurl and disable-fonts patch
2019-09-16 08:40:16 +00:00
#endif // DISABLE_ROMAN_FONTS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (xloadfont(&dc.bfont, pattern))
die("can't open font %s\n", fontstr);
FcPatternDestroy(pattern);
}
void
xunloadfont(Font *f)
{
XftFontClose(xw.dpy, f->match);
FcPatternDestroy(f->pattern);
if (f->set)
FcFontSetDestroy(f->set);
}
void
xunloadfonts(void)
{
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#if LIGATURES_PATCH
/* Clear Harfbuzz font cache. */
hbunloadfonts();
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Free the loaded fonts in the font cache. */
while (frclen > 0)
XftFontClose(xw.dpy, frc[--frclen].font);
xunloadfont(&dc.font);
xunloadfont(&dc.bfont);
xunloadfont(&dc.ifont);
xunloadfont(&dc.ibfont);
}
void
xinit(int cols, int rows)
{
XGCValues gcvalues;
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#if HIDECURSOR_PATCH
Pixmap blankpm;
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#elif !SWAPMOUSE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Cursor cursor;
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#endif // HIDECURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Window parent;
pid_t thispid = getpid();
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#if !SWAPMOUSE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XColor xmousefg, xmousebg;
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#endif // SWAPMOUSE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
#if ALPHA_PATCH
XWindowAttributes attr;
XVisualInfo vis;
#endif // ALPHA_PATCH
Adding background image reload patch ref. pull request #62
2022-04-11 13:56:12 +00:00
#if !XRESOURCES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (!(xw.dpy = XOpenDisplay(NULL)))
die("can't open display\n");
Adding background image reload patch ref. pull request #62
2022-04-11 13:56:12 +00:00
#endif // XRESOURCES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.scr = XDefaultScreen(xw.dpy);
#if ALPHA_PATCH
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
parent = XRootWindow(xw.dpy, xw.scr);
xw.depth = 32;
} else {
XGetWindowAttributes(xw.dpy, parent, &attr);
xw.depth = attr.depth;
}
XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
xw.vis = vis.visual;
#else
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
#endif // ALPHA_PATCH
/* font */
if (!FcInit())
die("could not init fontconfig.\n");
usedfont = (opt_font == NULL)? font : opt_font;
xloadfonts(usedfont, 0);
Adding font2 patch as per request #3
2020-03-21 15:41:43 +00:00
#if FONT2_PATCH
/* spare fonts */
xloadsparefonts();
#endif // FONT2_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* colors */
#if ALPHA_PATCH
xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
#else
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
#endif // ALPHA_PATCH
xloadcols();
/* adjust fixed window geometry */
#if ANYSIZE_PATCH
win.w = 2 * win.hborderpx + cols * win.cw;
win.h = 2 * win.vborderpx + rows * win.ch;
#else
win.w = 2 * borderpx + cols * win.cw;
win.h = 2 * borderpx + rows * win.ch;
#endif // ANYSIZE_PATCH
if (xw.gm & XNegative)
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
if (xw.gm & YNegative)
xw.t += DisplayHeight(xw.dpy, xw.scr) - win.h - 2;
/* Events */
xw.attrs.background_pixel = dc.col[defaultbg].pixel;
xw.attrs.border_pixel = dc.col[defaultbg].pixel;
xw.attrs.bit_gravity = NorthWestGravity;
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
xw.attrs.event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
Adding st embedder patch
2020-01-07 07:05:00 +00:00
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
#if ST_EMBEDDER_PATCH
| SubstructureNotifyMask | SubstructureRedirectMask
#endif // ST_EMBEDDER_PATCH
;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.attrs.colormap = xw.cmap;
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
xw.attrs.event_mask |= PointerMotionMask;
#endif // OPENURLONCLICK_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
#if !ALPHA_PATCH
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
parent = XRootWindow(xw.dpy, xw.scr);
#endif // ALPHA_PATCH
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
#if ALPHA_PATCH
win.w, win.h, 0, xw.depth, InputOutput,
#else
win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
#endif // ALPHA_PATCH
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
| CWEventMask | CWColormap, &xw.attrs);
memset(&gcvalues, 0, sizeof(gcvalues));
gcvalues.graphics_exposures = False;
#if ALPHA_PATCH
Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
2020-06-26 13:01:30 +00:00
#if SINGLE_DRAWABLE_BUFFER_PATCH
xw.buf = xw.win;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
2020-06-26 13:01:30 +00:00
#endif // SINGLE_DRAWABLE_BUFFER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
#else
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
&gcvalues);
Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
2020-06-26 13:01:30 +00:00
#if SINGLE_DRAWABLE_BUFFER_PATCH
xw.buf = xw.win;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
DefaultDepth(xw.dpy, xw.scr));
Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
2020-06-26 13:01:30 +00:00
#endif // SINGLE_DRAWABLE_BUFFER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
#endif // ALPHA_PATCH
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
/* font spec buffer */
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#if LIGATURES_PATCH
xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec) * 4);
xw.specseq = xmalloc(cols * sizeof(GlyphFontSeq));
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Xft rendering context */
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* input methods */
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
if (!ximopen(xw.dpy)) {
XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
ximinstantiate, NULL);
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* white cursor, black outline */
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#if HIDECURSOR_PATCH
xw.pointerisvisible = 1;
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#if THEMED_CURSOR_PATCH
xw.vpointer = XcursorLibraryLoadCursor(xw.dpy, mouseshape);
#else
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape);
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#endif // THEMED_CURSOR_PATCH
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#elif THEMED_CURSOR_PATCH
cursor = XcursorLibraryLoadCursor(xw.dpy, mouseshape);
XDefineCursor(xw.dpy, xw.win, cursor);
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
cursor = XCreateFontCursor(xw.dpy, mouseshape);
XDefineCursor(xw.dpy, xw.win, cursor);
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#endif // HIDECURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#if !THEMED_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
xmousefg.red = 0xffff;
xmousefg.green = 0xffff;
xmousefg.blue = 0xffff;
}
if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
xmousebg.red = 0x0000;
xmousebg.green = 0x0000;
xmousebg.blue = 0x0000;
}
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#endif // THEMED_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#if HIDECURSOR_PATCH
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#if !THEMED_CURSOR_PATCH
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg);
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#endif // THEMED_CURSOR_PATCH
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
&xmousefg, &xmousebg, 0, 0);
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#elif !THEMED_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#endif // HIDECURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
xw.upointer = XCreateFontCursor(xw.dpy, XC_hand2);
#if !HIDECURSOR_PATCH
xw.vpointer = cursor;
xw.pointerisvisible = 1;
#endif // HIDECURSOR_PATCH
#endif // OPENURLONCLICK_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
ST: Add WM_ICON_NAME property support Also added _NET_WM_ICON_NAME. https://git.suckless.org/st/commit/28b4c822c5c0acec300fdf15c6e3ede9f5e2335d.html#h0-1-11 https://git.suckless.org/st/commit/4ef0cbd8b9371f37f7d02ef37b5378b879e6b8bf.html#h0-0-3
2021-05-10 07:28:15 +00:00
xw.netwmiconname = XInternAtom(xw.dpy, "_NET_WM_ICON_NAME", False);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
Adding netwmicon patch ref. #21
2021-05-08 12:49:59 +00:00
#if NETWMICON_PATCH
xw.netwmicon = XInternAtom(xw.dpy, "_NET_WM_ICON", False);
XChangeProperty(xw.dpy, xw.win, xw.netwmicon, XA_CARDINAL, 32,
PropModeReplace, (uchar *)&icon, LEN(icon));
#endif //NETWMICON_PATCH
Adding the no window decorations patch
2022-08-24 09:04:49 +00:00
#if NO_WINDOW_DECORATIONS_PATCH
Atom motifwmhints = XInternAtom(xw.dpy, "_MOTIF_WM_HINTS", False);
unsigned int data[] = { 0x2, 0x0, 0x0, 0x0, 0x0 };
XChangeProperty(xw.dpy, xw.win, motifwmhints, motifwmhints, 16,
PropModeReplace, (unsigned char *)data, 5);
#endif // NO_WINDOW_DECORATIONS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
PropModeReplace, (uchar *)&thispid, 1);
Adding fullscreen patch ref. #88
2022-10-24 09:27:51 +00:00
#if FULLSCREEN_PATCH
xw.netwmstate = XInternAtom(xw.dpy, "_NET_WM_STATE", False);
xw.netwmfullscreen = XInternAtom(xw.dpy, "_NET_WM_STATE_FULLSCREEN", False);
#endif // FULLSCREEN_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
win.mode = MODE_NUMLOCK;
resettitle();
xhints();
apply hints before initial mapping (ICCCM) (843cfe)
2020-03-24 13:17:17 +00:00
XMapWindow(xw.dpy, xw.win);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XSync(xw.dpy, False);
clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2);
xsel.primary = NULL;
xsel.clipboard = NULL;
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
if (xsel.xtarget == None)
xsel.xtarget = XA_STRING;
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#if BOXDRAW_PATCH
boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
#endif // BOXDRAW_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
#if LIGATURES_PATCH
void
ligatures: upgrading
2024-03-07 14:34:21 +00:00
xresetfontsettings(uint32_t mode, Font **font, int *frcflags)
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
{
*font = &dc.font;
if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
*font = &dc.ibfont;
*frcflags = FRC_ITALICBOLD;
} else if (mode & ATTR_ITALIC) {
*font = &dc.ifont;
*frcflags = FRC_ITALIC;
} else if (mode & ATTR_BOLD) {
*font = &dc.bfont;
*frcflags = FRC_BOLD;
}
}
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
int
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
{
#if ANYSIZE_PATCH
float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
#else
float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
#endif // ANYSIZE_PATCH
ushort mode, prevmode = USHRT_MAX;
Font *font = &dc.font;
int frcflags = FRC_NORMAL;
ligatures: upgrading
2024-03-07 14:34:21 +00:00
float runewidth = win.cw * ((glyphs[0].mode & ATTR_WIDE) ? 2.0f : 1.0f);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Rune rune;
FT_UInt glyphidx;
FcResult fcres;
FcPattern *fcpattern, *fontpattern;
FcFontSet *fcsets[] = { NULL };
FcCharSet *fccharset;
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
int i, f, numspecs = 0;
xmakeglyphfontspecs: fix for when not using ligatures
2024-03-07 20:59:15 +00:00
#if LIGATURES_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
float cluster_xp, cluster_yp;
HbTransformData shaped;
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
/* Initial values. */
ligatures: upgrading
2024-03-07 14:34:21 +00:00
xresetfontsettings(glyphs[0].mode, &font, &frcflags);
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#if VERTCENTER_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
xp = winx, yp = winy + font->ascent + win.cyo;
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#else
xp = winx, yp = winy + font->ascent;
#endif // VERTCENTER_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
cluster_xp = xp; cluster_yp = yp;
/* Shape the segment. */
hbtransform(&shaped, font->match, glyphs, 0, len);
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#if LIGATURES_PATCH
for (int code_idx = 0; code_idx < shaped.count; code_idx++)
#elif VERTCENTER_PATCH
Adding scrollback patch
2019-09-16 13:31:58 +00:00
for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i)
#else
for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i)
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#endif // LIGATURES_PATCH | VERTCENTER_PATCH
Adding scrollback patch
2019-09-16 13:31:58 +00:00
{
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Fetch rune and mode for current glyph. */
Removing the VIM browse patch. The general reasoning is that the vim browse patch is very invasive, has a high level of complexity, and is incompatible with a significant number of other patches and it complicates further maintenance. Additionally the patch has its own scrollback mechanism which seemingly did not work properly - and nobody seems to have complained about this since the patch was added back in May 2021. If you want to try out the vim browse patch then I would recommend having a play around with the patch author's own build that has this patch integrated: - https://github.com/juliusHuelsmann/st-history-vim - https://github.com/juliusHuelsmann/st Alternatively a tag has been added to this repository that refers to the last commit that still has the vim browse patch: - https://github.com/bakkeby/st-flexipatch/tree/VIM_BROWSE_PATCH
2024-03-07 21:35:11 +00:00
#if LIGATURES_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
int idx = shaped.glyphs[code_idx].cluster;
Adding vim browse patch ref. #21
2021-05-09 15:48:28 +00:00
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
rune = glyphs[i].u;
mode = glyphs[i].mode;
Removing the VIM browse patch. The general reasoning is that the vim browse patch is very invasive, has a high level of complexity, and is incompatible with a significant number of other patches and it complicates further maintenance. Additionally the patch has its own scrollback mechanism which seemingly did not work properly - and nobody seems to have complained about this since the patch was added back in May 2021. If you want to try out the vim browse patch then I would recommend having a play around with the patch author's own build that has this patch integrated: - https://github.com/juliusHuelsmann/st-history-vim - https://github.com/juliusHuelsmann/st Alternatively a tag has been added to this repository that refers to the last commit that still has the vim browse patch: - https://github.com/bakkeby/st-flexipatch/tree/VIM_BROWSE_PATCH
2024-03-07 21:35:11 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Skip dummy wide-character spacing. */
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#if LIGATURES_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
if (glyphs[idx].mode & ATTR_WDUMMY)
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
continue;
ligatures: upgrading
2024-03-07 14:34:21 +00:00
/* Advance the drawing cursor if we've moved to a new cluster */
if (code_idx > 0 && idx != shaped.glyphs[code_idx - 1].cluster) {
xp += runewidth;
cluster_xp = xp;
cluster_yp = yp;
}
#if BOXDRAW_PATCH
if (glyphs[idx].mode & ATTR_BOXDRAW) {
/* minor shoehorning: boxdraw uses only this ushort */
specs[numspecs].font = font->match;
specs[numspecs].glyph = boxdrawindex(&glyphs[idx]);
specs[numspecs].x = xp;
specs[numspecs].y = yp;
numspecs++;
} else if (shaped.glyphs[code_idx].codepoint != 0) {
#else
if (shaped.glyphs[code_idx].codepoint != 0) {
#endif // BOXDRAW_PATCH
/* If symbol is found, put it into the specs. */
specs[numspecs].font = font->match;
specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
cluster_xp += shaped.positions[code_idx].x_advance / 64.;
cluster_yp += shaped.positions[code_idx].y_advance / 64.;
numspecs++;
} else {
/* If it's not found, try to fetch it through the font cache. */
rune = glyphs[idx].u;
for (f = 0; f < frclen; f++) {
glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
/* Everything correct. */
if (glyphidx && frc[f].flags == frcflags)
break;
/* We got a default font for a not found glyph. */
if (!glyphidx && frc[f].flags == frcflags
&& frc[f].unicodep == rune) {
break;
}
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
}
ligatures: upgrading
2024-03-07 14:34:21 +00:00
/* Nothing was found. Use fontconfig to find matching font. */
if (f >= frclen) {
if (!font->set)
font->set = FcFontSort(0, font->pattern, 1, 0, &fcres);
fcsets[0] = font->set;
/*
* Nothing was found in the cache. Now use
* some dozen of Fontconfig calls to get the
* font for one single character.
*
* Xft and fontconfig are design failures.
*/
fcpattern = FcPatternDuplicate(font->pattern);
fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, rune);
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
FcConfigSubstitute(0, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern);
fontpattern = FcFontSetMatch(0, fcsets, 1, fcpattern, &fcres);
/* Allocate memory for the new cache entry. */
if (frclen >= frccap) {
frccap += 16;
frc = xrealloc(frc, frccap * sizeof(Fontcache));
}
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
ligatures: upgrading
2024-03-07 14:34:21 +00:00
frc[frclen].font = XftFontOpenPattern(xw.dpy, fontpattern);
if (!frc[frclen].font)
die("XftFontOpenPattern failed seeking fallback font: %s\n",
strerror(errno));
frc[frclen].flags = frcflags;
frc[frclen].unicodep = rune;
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
ligatures: upgrading
2024-03-07 14:34:21 +00:00
glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
ligatures: upgrading
2024-03-07 14:34:21 +00:00
f = frclen;
frclen++;
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
ligatures: upgrading
2024-03-07 14:34:21 +00:00
FcPatternDestroy(fcpattern);
FcCharSetDestroy(fccharset);
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
}
ligatures: upgrading
2024-03-07 14:34:21 +00:00
specs[numspecs].font = frc[f].font;
specs[numspecs].glyph = glyphidx;
specs[numspecs].x = (short)xp;
specs[numspecs].y = (short)yp;
numspecs++;
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
}
#else // !LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (mode == ATTR_WDUMMY)
continue;
/* Determine font for glyph if different from previous glyph. */
if (prevmode != mode) {
prevmode = mode;
font = &dc.font;
frcflags = FRC_NORMAL;
runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
font = &dc.ibfont;
frcflags = FRC_ITALICBOLD;
} else if (mode & ATTR_ITALIC) {
font = &dc.ifont;
frcflags = FRC_ITALIC;
} else if (mode & ATTR_BOLD) {
font = &dc.bfont;
frcflags = FRC_BOLD;
}
Adding scrollback patch
2019-09-16 13:31:58 +00:00
#if VERTCENTER_PATCH
yp = winy + font->ascent + win.cyo;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
yp = winy + font->ascent;
Adding scrollback patch
2019-09-16 13:31:58 +00:00
#endif // VERTCENTER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#if BOXDRAW_PATCH
if (mode & ATTR_BOXDRAW) {
/* minor shoehorning: boxdraw uses only this ushort */
glyphidx = boxdrawindex(&glyphs[i]);
} else {
/* Lookup character index with default font. */
glyphidx = XftCharIndex(xw.dpy, font->match, rune);
}
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Lookup character index with default font. */
glyphidx = XftCharIndex(xw.dpy, font->match, rune);
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#endif // BOXDRAW_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (glyphidx) {
specs[numspecs].font = font->match;
specs[numspecs].glyph = glyphidx;
specs[numspecs].x = (short)xp;
specs[numspecs].y = (short)yp;
xp += runewidth;
numspecs++;
continue;
}
/* Fallback on font cache, search the font cache for match. */
for (f = 0; f < frclen; f++) {
glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
/* Everything correct. */
if (glyphidx && frc[f].flags == frcflags)
break;
/* We got a default font for a not found glyph. */
if (!glyphidx && frc[f].flags == frcflags
&& frc[f].unicodep == rune) {
break;
}
}
/* Nothing was found. Use fontconfig to find matching font. */
if (f >= frclen) {
if (!font->set)
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
font->set = FcFontSort(0, font->pattern, 1, 0, &fcres);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
fcsets[0] = font->set;
/*
* Nothing was found in the cache. Now use
* some dozen of Fontconfig calls to get the
* font for one single character.
*
* Xft and fontconfig are design failures.
*/
fcpattern = FcPatternDuplicate(font->pattern);
fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, rune);
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
Adding use XftFontMatch patch
2022-08-28 19:05:55 +00:00
#if !USE_XFTFONTMATCH_PATCH
FcConfigSubstitute(0, fcpattern, FcMatchPattern);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FcDefaultSubstitute(fcpattern);
Adding use XftFontMatch patch
2022-08-28 19:05:55 +00:00
#endif // USE_XFTFONTMATCH_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding use XftFontMatch patch
2022-08-28 19:05:55 +00:00
fontpattern = FcFontSetMatch(0, fcsets, 1, fcpattern, &fcres);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding font2 patch as per request #3
2020-03-21 15:41:43 +00:00
/* Allocate memory for the new cache entry. */
if (frclen >= frccap) {
frccap += 16;
frc = xrealloc(frc, frccap * sizeof(Fontcache));
Adding vim browse patch ref. #21
2021-05-09 15:48:28 +00:00
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
frc[frclen].font = XftFontOpenPattern(xw.dpy, fontpattern);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (!frc[frclen].font)
die("XftFontOpenPattern failed seeking fallback font: %s\n",
strerror(errno));
frc[frclen].flags = frcflags;
frc[frclen].unicodep = rune;
glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
f = frclen;
frclen++;
FcPatternDestroy(fcpattern);
FcCharSetDestroy(fccharset);
}
specs[numspecs].font = frc[f].font;
specs[numspecs].glyph = glyphidx;
specs[numspecs].x = (short)xp;
specs[numspecs].y = (short)yp;
xp += runewidth;
numspecs++;
ligatures: upgrading patch
2022-12-19 09:09:06 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
return numspecs;
}
undercurl: upgrading patch with curly, spiky and capped options Ref. https://git.suckless.org/sites/commit/9bb304a974185cbd9fa48c890450c6582d3e0546.html
2021-08-22 16:35:31 +00:00
#if UNDERCURL_PATCH
static int isSlopeRising (int x, int iPoint, int waveWidth)
{
// . . . .
// / \ / \ / \ / \
// / \ / \ / \ / \
// . . . . .
// Find absolute `x` of point
x += iPoint * (waveWidth/2);
// Find index of absolute wave
int absSlope = x / ((float)waveWidth/2);
return (absSlope % 2);
}
static int getSlope (int x, int iPoint, int waveWidth)
{
// Sizes: Caps are half width of slopes
// 1_2 1_2 1_2 1_2
// / \ / \ / \ / \
// / \ / \ / \ / \
// 0 3_0 3_0 3_0 3_
// <2-> <1> <---6---->
// Find type of first point
int firstType;
x -= (x / waveWidth) * waveWidth;
if (x < (waveWidth * (2.f/6.f)))
firstType = UNDERCURL_SLOPE_ASCENDING;
else if (x < (waveWidth * (3.f/6.f)))
firstType = UNDERCURL_SLOPE_TOP_CAP;
else if (x < (waveWidth * (5.f/6.f)))
firstType = UNDERCURL_SLOPE_DESCENDING;
else
firstType = UNDERCURL_SLOPE_BOTTOM_CAP;
// Find type of given point
int pointType = (iPoint % 4);
pointType += firstType;
pointType %= 4;
return pointType;
}
#endif // UNDERCURL_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#if WIDE_GLYPHS_PATCH
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
,int dmode
#endif // WIDE_GLYPHS_PATCH
#if LIGATURES_PATCH
, int charlen
#endif // LIGATURES_PATCH
) {
#if LIGATURES_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
int width = charlen * win.cw;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
ligatures: upgrading
2024-03-07 14:34:21 +00:00
int width = charlen * win.cw;
#endif // WIDE_GLYPHS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
#if ANYSIZE_PATCH
int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch;
#else
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch;
#endif // ANYSIZE_PATCH
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
XRenderColor colfg, colbg;
XRectangle r;
/* Fallback on color display for attributes not supported by the font */
if (base.mode & ATTR_ITALIC && base.mode & ATTR_BOLD) {
if (dc.ibfont.badslant || dc.ibfont.badweight)
base.fg = defaultattr;
} else if ((base.mode & ATTR_ITALIC && dc.ifont.badslant) ||
(base.mode & ATTR_BOLD && dc.bfont.badweight)) {
base.fg = defaultattr;
}
if (IS_TRUECOL(base.fg)) {
colfg.alpha = 0xffff;
colfg.red = TRUERED(base.fg);
colfg.green = TRUEGREEN(base.fg);
colfg.blue = TRUEBLUE(base.fg);
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg);
fg = &truefg;
} else {
fg = &dc.col[base.fg];
}
if (IS_TRUECOL(base.bg)) {
colbg.alpha = 0xffff;
colbg.green = TRUEGREEN(base.bg);
colbg.red = TRUERED(base.bg);
colbg.blue = TRUEBLUE(base.bg);
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg);
bg = &truebg;
} else {
bg = &dc.col[base.bg];
}
Adding bold-is-not-bright patch
2019-09-16 07:40:40 +00:00
#if !BOLD_IS_NOT_BRIGHT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* 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))
fg = &dc.col[base.fg + 8];
Adding bold-is-not-bright patch
2019-09-16 07:40:40 +00:00
#endif // BOLD_IS_NOT_BRIGHT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (IS_SET(MODE_REVERSE)) {
if (fg == &dc.col[defaultfg]) {
fg = &dc.col[defaultbg];
} else {
colfg.red = ~fg->color.red;
colfg.green = ~fg->color.green;
colfg.blue = ~fg->color.blue;
colfg.alpha = fg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
&revfg);
fg = &revfg;
}
if (bg == &dc.col[defaultbg]) {
bg = &dc.col[defaultfg];
} else {
colbg.red = ~bg->color.red;
colbg.green = ~bg->color.green;
colbg.blue = ~bg->color.blue;
colbg.alpha = bg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
&revbg);
bg = &revbg;
}
}
if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
colfg.red = fg->color.red / 2;
colfg.green = fg->color.green / 2;
colfg.blue = fg->color.blue / 2;
colfg.alpha = fg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
fg = &revfg;
}
if (base.mode & ATTR_REVERSE) {
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#if SPOILER_PATCH
if (bg == fg) {
bg = &dc.col[defaultfg];
fg = &dc.col[defaultbg];
} else {
temp = fg;
fg = bg;
bg = temp;
}
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
temp = fg;
fg = bg;
bg = temp;
Adding spoiler, external pipe and themed cursor patches
2019-09-16 23:18:44 +00:00
#endif // SPOILER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#if SELECTION_COLORS_PATCH
if (base.mode & ATTR_SELECTED) {
bg = &dc.col[selectionbg];
if (!ignoreselfg)
fg = &dc.col[selectionfg];
}
#endif // SELECTION_COLORS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
fg = bg;
if (base.mode & ATTR_INVISIBLE)
fg = bg;
Adding invert patch
2020-03-29 13:38:16 +00:00
#if INVERT_PATCH
if (invertcolors) {
revfg = invertedcolor(fg);
revbg = invertedcolor(bg);
fg = &revfg;
bg = &revbg;
}
#endif // INVERT_PATCH
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (base.mode & ATTR_HIGHLIGHT) {
fg = &dc.col[(base.mode & ATTR_REVERSE) ? highlightbg : highlightfg];
bg = &dc.col[(base.mode & ATTR_REVERSE) ? highlightfg : highlightbg];
}
#endif // KEYBOARDSELECT_PATCH
Adding alpha gradient patch
2021-02-15 13:37:37 +00:00
#if ALPHA_PATCH && ALPHA_GRADIENT_PATCH
// gradient
bg->color.alpha = grad_alpha * 0xffff * (win.h - y*win.ch) / win.h + stat_alpha * 0xffff;
// uncomment to invert the gradient
// bg->color.alpha = grad_alpha * 0xffff * (y*win.ch) / win.h + stat_alpha * 0xffff;
#endif // ALPHA_PATCH | ALPHA_GRADIENT_PATCH
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
#if WIDE_GLYPHS_PATCH
if (dmode & DRAW_BG) {
#endif // WIDE_GLYPHS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Intelligent cleaning up of the borders. */
#if ANYSIZE_PATCH
if (x == 0) {
Fix border issues in the anysize patch
2022-07-16 20:35:27 +00:00
xclear(0, (y == 0)? 0 : winy, win.hborderpx,
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
winy + win.ch +
((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
}
if (winx + width >= win.hborderpx + win.tw) {
xclear(winx + width, (y == 0)? 0 : winy, win.w,
((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
}
if (y == 0)
Fix border issues in the anysize patch
2022-07-16 20:35:27 +00:00
xclear(winx, 0, winx + width, win.vborderpx);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (winy + win.ch >= win.vborderpx + win.th)
xclear(winx, winy + win.ch, winx + width, win.h);
#else
if (x == 0) {
xclear(0, (y == 0)? 0 : winy, borderpx,
winy + win.ch +
((winy + win.ch >= borderpx + win.th)? win.h : 0));
}
if (winx + width >= borderpx + win.tw) {
xclear(winx + width, (y == 0)? 0 : winy, win.w,
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
}
if (y == 0)
xclear(winx, 0, winx + width, borderpx);
if (winy + win.ch >= borderpx + win.th)
xclear(winx, winy + win.ch, winx + width, win.h);
#endif // ANYSIZE_PATCH
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
/* Clean up the region we want to draw to. */
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
if (bg == &dc.col[defaultbg])
xclear(winx, winy, winx + width, winy + win.ch);
else
#endif // BACKGROUND_IMAGE_PATCH
wide glyphs: adding alternative patch ref. #56
2022-08-11 13:56:36 +00:00
#if !WIDE_GLYPHS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
#endif // WIDE_GLYPHS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Set the clip region because Xft is sometimes dirty. */
r.x = 0;
r.y = 0;
r.height = win.ch;
r.width = width;
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
wide glyphs: adding alternative patch ref. #56
2022-08-11 13:56:36 +00:00
#if WIDE_GLYPHS_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
/* Fill the background */
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
wide glyphs: adding alternative patch ref. #56
2022-08-11 13:56:36 +00:00
}
Proposed fix for wide glyphs ref. #26
2021-05-15 07:16:51 +00:00
#endif // WIDE_GLYPHS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
#if WIDE_GLYPHS_PATCH
if (dmode & DRAW_FG) {
#endif // WIDE_GLYPHS_PATCH
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#if BOXDRAW_PATCH
if (base.mode & ATTR_BOXDRAW) {
drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
} else {
/* Render the glyphs. */
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
}
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Render the glyphs. */
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#endif // BOXDRAW_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Render underline and strikethrough. */
if (base.mode & ATTR_UNDERLINE) {
Adding undercurl patch ref. #20
2021-05-08 08:53:46 +00:00
#if UNDERCURL_PATCH
// Underline Color
undercurl: upgrading patch with curly, spiky and capped options Ref. https://git.suckless.org/sites/commit/9bb304a974185cbd9fa48c890450c6582d3e0546.html
2021-08-22 16:35:31 +00:00
const int widthThreshold = 28; // +1 width every widthThreshold px of font
int wlw = (win.ch / widthThreshold) + 1; // Wave Line Width
Adding undercurl patch ref. #20
2021-05-08 08:53:46 +00:00
int linecolor;
if ((base.ucolor[0] >= 0) &&
!(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) &&
!(base.mode & ATTR_INVISIBLE)
) {
// Special color for underline
// Index
if (base.ucolor[1] < 0) {
linecolor = dc.col[base.ucolor[0]].pixel;
}
// RGB
else {
XColor lcolor;
lcolor.red = base.ucolor[0] * 257;
lcolor.green = base.ucolor[1] * 257;
lcolor.blue = base.ucolor[2] * 257;
lcolor.flags = DoRed | DoGreen | DoBlue;
XAllocColor(xw.dpy, xw.cmap, &lcolor);
linecolor = lcolor.pixel;
}
} else {
// Foreground color for underline
linecolor = fg->pixel;
}
XGCValues ugcv = {
.foreground = linecolor,
.line_width = wlw,
.line_style = LineSolid,
.cap_style = CapNotLast
};
GC ugc = XCreateGC(xw.dpy, XftDrawDrawable(xw.draw),
GCForeground | GCLineWidth | GCLineStyle | GCCapStyle,
&ugcv);
// Underline Style
if (base.ustyle != 3) {
XFillRectangle(xw.dpy, XftDrawDrawable(xw.draw), ugc, winx,
make underlines and strikethroughs respect `chscale` Ref. https://git.suckless.org/st/commit/2aefa348baf4b702fdce98eb105bcba175d8283f.html
2022-03-14 08:45:12 +00:00
winy + dc.font.ascent * chscale + 1, width, wlw);
Adding undercurl patch ref. #20
2021-05-08 08:53:46 +00:00
} else if (base.ustyle == 3) {
int ww = win.cw;//width;
int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
int wx = winx;
int wy = winy + win.ch - dc.font.descent;
#if VERTCENTER_PATCH
Adding vim browse patch ref. #21
2021-05-09 15:48:28 +00:00
wy -= win.cyo;
Adding undercurl patch ref. #20
2021-05-08 08:53:46 +00:00
#endif // VERTCENTER_PATCH
undercurl: upgrading patch with curly, spiky and capped options Ref. https://git.suckless.org/sites/commit/9bb304a974185cbd9fa48c890450c6582d3e0546.html
2021-08-22 16:35:31 +00:00
#if UNDERCURL_STYLE == UNDERCURL_CURLY
Adding undercurl patch ref. #20
2021-05-08 08:53:46 +00:00
// Draw waves
int narcs = charlen * 2 + 1;
XArc *arcs = xmalloc(sizeof(XArc) * narcs);
int i = 0;
for (i = 0; i < charlen-1; i++) {
arcs[i*2] = (XArc) {
.x = wx + win.cw * i + ww / 4,
.y = wy,
.width = win.cw / 2,
.height = wh,
.angle1 = 0,
.angle2 = 180 * 64
};
arcs[i*2+1] = (XArc) {
.x = wx + win.cw * i + ww * 0.75,
.y = wy,
.width = win.cw/2,
.height = wh,
.angle1 = 180 * 64,
.angle2 = 180 * 64
};
}
// Last wave
arcs[i*2] = (XArc) {wx + ww * i + ww / 4, wy, ww / 2, wh,
0, 180 * 64 };
// Last wave tail
arcs[i*2+1] = (XArc) {wx + ww * i + ww * 0.75, wy, ceil(ww / 2.),
wh, 180 * 64, 90 * 64};
// First wave tail
i++;
arcs[i*2] = (XArc) {wx - ww/4 - 1, wy, ceil(ww / 2.), wh, 270 * 64,
90 * 64 };
XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs);
free(arcs);
undercurl: upgrading patch with curly, spiky and capped options Ref. https://git.suckless.org/sites/commit/9bb304a974185cbd9fa48c890450c6582d3e0546.html
2021-08-22 16:35:31 +00:00
#elif UNDERCURL_STYLE == UNDERCURL_SPIKY
// Make the underline corridor larger
/*
wy -= wh;
*/
wh *= 2;
// Set the angle of the slope to 45°
ww = wh;
// Position of wave is independent of word, it's absolute
wx = (wx / (ww/2)) * (ww/2);
int marginStart = winx - wx;
// Calculate number of points with floating precision
float n = width; // Width of word in pixels
n = (n / ww) * 2; // Number of slopes (/ or \)
n += 2; // Add two last points
int npoints = n; // Convert to int
// Total length of underline
float waveLength = 0;
if (npoints >= 3) {
// We add an aditional slot in case we use a bonus point
XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
// First point (Starts with the word bounds)
points[0] = (XPoint) {
.x = wx + marginStart,
.y = (isSlopeRising(wx, 0, ww))
? (wy - marginStart + ww/2.f)
: (wy + marginStart)
};
// Second point (Goes back to the absolute point coordinates)
points[1] = (XPoint) {
.x = (ww/2.f) - marginStart,
.y = (isSlopeRising(wx, 1, ww))
? (ww/2.f - marginStart)
: (-ww/2.f + marginStart)
};
waveLength += (ww/2.f) - marginStart;
// The rest of the points
for (int i = 2; i < npoints-1; i++) {
points[i] = (XPoint) {
.x = ww/2,
.y = (isSlopeRising(wx, i, ww))
? wh/2
: -wh/2
};
waveLength += ww/2;
}
// Last point
points[npoints-1] = (XPoint) {
.x = ww/2,
.y = (isSlopeRising(wx, npoints-1, ww))
? wh/2
: -wh/2
};
waveLength += ww/2;
// End
if (waveLength < width) { // Add a bonus point?
int marginEnd = width - waveLength;
points[npoints] = (XPoint) {
.x = marginEnd,
.y = (isSlopeRising(wx, npoints, ww))
? (marginEnd)
: (-marginEnd)
};
npoints++;
} else if (waveLength > width) { // Is last point too far?
int marginEnd = waveLength - width;
points[npoints-1].x -= marginEnd;
if (isSlopeRising(wx, npoints-1, ww))
points[npoints-1].y -= (marginEnd);
else
points[npoints-1].y += (marginEnd);
}
// Draw the lines
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
CoordModePrevious);
// Draw a second underline with an offset of 1 pixel
if ( ((win.ch / (widthThreshold/2)) % 2)) {
points[0].x++;
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
npoints, CoordModePrevious);
}
// Free resources
free(points);
}
#else // UNDERCURL_CAPPED
// Cap is half of wave width
float capRatio = 0.5f;
// Make the underline corridor larger
wh *= 2;
// Set the angle of the slope to 45°
ww = wh;
ww *= 1 + capRatio; // Add a bit of width for the cap
// Position of wave is independent of word, it's absolute
wx = (wx / ww) * ww;
float marginStart;
switch(getSlope(winx, 0, ww)) {
case UNDERCURL_SLOPE_ASCENDING:
marginStart = winx - wx;
break;
case UNDERCURL_SLOPE_TOP_CAP:
marginStart = winx - (wx + (ww * (2.f/6.f)));
break;
case UNDERCURL_SLOPE_DESCENDING:
marginStart = winx - (wx + (ww * (3.f/6.f)));
break;
case UNDERCURL_SLOPE_BOTTOM_CAP:
marginStart = winx - (wx + (ww * (5.f/6.f)));
break;
}
// Calculate number of points with floating precision
float n = width; // Width of word in pixels
// ._.
n = (n / ww) * 4; // Number of points (./ \.)
n += 2; // Add two last points
int npoints = n; // Convert to int
// Position of the pen to draw the lines
float penX = 0;
float penY = 0;
if (npoints >= 3) {
XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
// First point (Starts with the word bounds)
penX = winx;
switch (getSlope(winx, 0, ww)) {
case UNDERCURL_SLOPE_ASCENDING:
penY = wy + wh/2.f - marginStart;
break;
case UNDERCURL_SLOPE_TOP_CAP:
penY = wy;
break;
case UNDERCURL_SLOPE_DESCENDING:
penY = wy + marginStart;
break;
case UNDERCURL_SLOPE_BOTTOM_CAP:
penY = wy + wh/2.f;
break;
}
points[0].x = penX;
points[0].y = penY;
// Second point (Goes back to the absolute point coordinates)
switch (getSlope(winx, 1, ww)) {
case UNDERCURL_SLOPE_ASCENDING:
penX += ww * (1.f/6.f) - marginStart;
penY += 0;
break;
case UNDERCURL_SLOPE_TOP_CAP:
penX += ww * (2.f/6.f) - marginStart;
penY += -wh/2.f + marginStart;
break;
case UNDERCURL_SLOPE_DESCENDING:
penX += ww * (1.f/6.f) - marginStart;
penY += 0;
break;
case UNDERCURL_SLOPE_BOTTOM_CAP:
penX += ww * (2.f/6.f) - marginStart;
penY += -marginStart + wh/2.f;
break;
}
points[1].x = penX;
points[1].y = penY;
// The rest of the points
for (int i = 2; i < npoints; i++) {
switch (getSlope(winx, i, ww)) {
case UNDERCURL_SLOPE_ASCENDING:
case UNDERCURL_SLOPE_DESCENDING:
penX += ww * (1.f/6.f);
penY += 0;
break;
case UNDERCURL_SLOPE_TOP_CAP:
penX += ww * (2.f/6.f);
penY += -wh / 2.f;
break;
case UNDERCURL_SLOPE_BOTTOM_CAP:
penX += ww * (2.f/6.f);
penY += wh / 2.f;
break;
}
points[i].x = penX;
points[i].y = penY;
}
// End
float waveLength = penX - winx;
if (waveLength < width) { // Add a bonus point?
int marginEnd = width - waveLength;
penX += marginEnd;
switch(getSlope(winx, npoints, ww)) {
case UNDERCURL_SLOPE_ASCENDING:
case UNDERCURL_SLOPE_DESCENDING:
//penY += 0;
break;
case UNDERCURL_SLOPE_TOP_CAP:
penY += -marginEnd;
break;
case UNDERCURL_SLOPE_BOTTOM_CAP:
penY += marginEnd;
break;
}
points[npoints].x = penX;
points[npoints].y = penY;
npoints++;
} else if (waveLength > width) { // Is last point too far?
int marginEnd = waveLength - width;
points[npoints-1].x -= marginEnd;
switch(getSlope(winx, npoints-1, ww)) {
case UNDERCURL_SLOPE_TOP_CAP:
points[npoints-1].y += marginEnd;
break;
case UNDERCURL_SLOPE_BOTTOM_CAP:
points[npoints-1].y -= marginEnd;
break;
default:
break;
}
}
// Draw the lines
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
CoordModeOrigin);
// Draw a second underline with an offset of 1 pixel
if ( ((win.ch / (widthThreshold/2)) % 2)) {
for (int i = 0; i < npoints; i++)
points[i].x++;
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
npoints, CoordModeOrigin);
}
// Free resources
free(points);
}
#endif
Adding undercurl patch ref. #20
2021-05-08 08:53:46 +00:00
}
XFreeGC(xw.dpy, ugc);
#elif VERTCENTER_PATCH
make underlines and strikethroughs respect `chscale` Ref. https://git.suckless.org/st/commit/2aefa348baf4b702fdce98eb105bcba175d8283f.html
2022-03-14 08:45:12 +00:00
XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent * chscale + 1,
Adding scrollback patch
2019-09-16 13:31:58 +00:00
width, 1);
#else
make underlines and strikethroughs respect `chscale` Ref. https://git.suckless.org/st/commit/2aefa348baf4b702fdce98eb105bcba175d8283f.html
2022-03-14 08:45:12 +00:00
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
width, 1);
Proposed fix for wide glyphs ref. #26
2021-05-15 07:16:51 +00:00
#endif // UNDERCURL_PATCH | VERTCENTER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
if (base.mode & ATTR_STRUCK) {
Adding scrollback patch
2019-09-16 13:31:58 +00:00
#if VERTCENTER_PATCH
make underlines and strikethroughs respect `chscale` Ref. https://git.suckless.org/st/commit/2aefa348baf4b702fdce98eb105bcba175d8283f.html
2022-03-14 08:45:12 +00:00
XftDrawRect(xw.draw, fg, winx, winy + win.cyo + 2 * dc.font.ascent * chscale / 3,
Adding scrollback patch
2019-09-16 13:31:58 +00:00
width, 1);
#else
make underlines and strikethroughs respect `chscale` Ref. https://git.suckless.org/st/commit/2aefa348baf4b702fdce98eb105bcba175d8283f.html
2022-03-14 08:45:12 +00:00
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
width, 1);
Adding scrollback patch
2019-09-16 13:31:58 +00:00
#endif // VERTCENTER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
#if WIDE_GLYPHS_PATCH
}
#endif // WIDE_GLYPHS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
/* underline url (openurlonclick patch) */
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
if (url_draw && y >= url_y1 && y <= url_y2) {
int x1 = (y == url_y1) ? url_x1 : 0;
int x2 = (y == url_y2) ? MIN(url_x2, term.col-1) : url_maxcol;
if (x + charlen > x1 && x <= x2) {
int xu = MAX(x, x1);
int wu = (x2 - xu + 1) * win.cw;
#if ANYSIZE_PATCH
xu = win.hborderpx + xu * win.cw;
#else
xu = borderpx + xu * win.cw;
#endif // ANYSIZE_PATCH
#if VERTCENTER_PATCH
XftDrawRect(xw.draw, fg, xu, winy + win.cyo + dc.font.ascent * chscale + 2, wu, 1);
#else
XftDrawRect(xw.draw, fg, xu, winy + dc.font.ascent * chscale + 2, wu, 1);
#endif // VERTCENTER_PATCH
url_draw = (y != url_y2 || x + charlen <= x2);
}
}
#endif // OPENURLONCLICK_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Reset clip to none. */
XftDrawSetClip(xw.draw, 0);
}
void
xdrawglyph(Glyph g, int x, int y)
{
int numspecs;
Fix buffer overflow in xdrawglyph() (#119) The buffer overflow occurs when the ligatures patch is enabled and xmakeglyphfontspecs() returns more than one XftGlyphFontSpec. Ref. https://github.com/cog1to/st-ligatures/issues/35
2024-03-11 21:54:16 +00:00
XftGlyphFontSpec *specs = xw.specbuf;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Fix buffer overflow in xdrawglyph() (#119) The buffer overflow occurs when the ligatures patch is enabled and xmakeglyphfontspecs() returns more than one XftGlyphFontSpec. Ref. https://github.com/cog1to/st-ligatures/issues/35
2024-03-11 21:54:16 +00:00
numspecs = xmakeglyphfontspecs(specs, &g, 1, x, y);
xdrawglyphfontspecs(specs, g, numspecs, x, y
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#if WIDE_GLYPHS_PATCH
,DRAW_BG | DRAW_FG
#endif // WIDE_GLYPHS_PATCH
#if LIGATURES_PATCH
,(g.mode & ATTR_WIDE) ? 2 : 1
#endif // LIGATURES_PATCH
);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
void
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#if LIGATURES_PATCH
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
{
Color drawcol;
Adding dynamic cursor color patch ref. #10
2021-02-26 13:33:03 +00:00
#if DYNAMIC_CURSOR_COLOR_PATCH
XRenderColor colbg;
#endif // DYNAMIC_CURSOR_COLOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
#if !DYNAMIC_CURSOR_COLOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* remove the old cursor */
if (selected(ox, oy))
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#if SELECTION_COLORS_PATCH
og.mode |= ATTR_SELECTED;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
og.mode ^= ATTR_REVERSE;
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#endif // SELECTION_COLORS_PATCH
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
#endif // DYNAMIC_CURSOR_COLOR_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#if LIGATURES_PATCH
/* Redraw the line where cursor was previously.
* It will restore the ligatures broken by the cursor. */
xdrawline(line, 0, oy, len);
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xdrawglyph(og, ox, oy);
Adding ligatures patch as requested in #4
2020-06-05 11:43:14 +00:00
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding hide terminal cursor patch
2021-06-09 07:54:50 +00:00
#if HIDE_TERMINAL_CURSOR_PATCH
if (IS_SET(MODE_HIDE) || !IS_SET(MODE_FOCUSED))
return;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (IS_SET(MODE_HIDE))
return;
Adding hide terminal cursor patch
2021-06-09 07:54:50 +00:00
#endif // HIDE_TERMINAL_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/*
* Select the right color for the right mode.
*/
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#if BOXDRAW_PATCH
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
|ATTR_BOXDRAW
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
#endif // BOXDRAW_PATCH
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
#if DYNAMIC_CURSOR_COLOR_PATCH
|ATTR_REVERSE
#endif // DYNAMIC_CURSOR_COLOR_PATCH
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
|ATTR_HIGHLIGHT
#endif // KEYBOARDSELECT_PATCH
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (IS_SET(MODE_REVERSE)) {
g.mode |= ATTR_REVERSE;
g.bg = defaultfg;
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#if SELECTION_COLORS_PATCH
g.fg = defaultcs;
drawcol = dc.col[defaultrcs];
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (selected(cx, cy)) {
drawcol = dc.col[defaultcs];
g.fg = defaultrcs;
} else {
drawcol = dc.col[defaultrcs];
g.fg = defaultcs;
}
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#endif // SELECTION_COLORS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
} else {
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#if SELECTION_COLORS_PATCH
g.fg = defaultbg;
g.bg = defaultcs;
drawcol = dc.col[defaultcs];
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (selected(cx, cy)) {
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
g.mode &= ~(ATTR_REVERSE | ATTR_HIGHLIGHT);
#elif DYNAMIC_CURSOR_COLOR_PATCH
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
g.mode &= ~ATTR_REVERSE;
#endif // DYNAMIC_CURSOR_COLOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
g.fg = defaultfg;
g.bg = defaultrcs;
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
} else {
#if DYNAMIC_CURSOR_COLOR_PATCH
Adding proposed scrollback changes for sixel graphics ref. #30
2021-07-07 07:43:43 +00:00
unsigned int tmpcol = g.bg;
Adding dynamic cursor color patch ref. #10
2021-02-26 13:33:03 +00:00
g.bg = g.fg;
Adding proposed scrollback changes for sixel graphics ref. #30
2021-07-07 07:43:43 +00:00
g.fg = tmpcol;
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
#else
g.fg = defaultbg;
g.bg = defaultcs;
#endif // DYNAMIC_CURSOR_COLOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Adding dynamic cursor color patch ref. #10
2021-02-26 13:33:03 +00:00
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
#if DYNAMIC_CURSOR_COLOR_PATCH
Adding dynamic cursor color patch ref. #10
2021-02-26 13:33:03 +00:00
if (IS_TRUECOL(g.bg)) {
colbg.alpha = 0xffff;
colbg.red = TRUERED(g.bg);
colbg.green = TRUEGREEN(g.bg);
colbg.blue = TRUEBLUE(g.bg);
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol);
} else
drawcol = dc.col[g.bg];
drawcol = dc.col[g.bg];
2024-03-07 22:40:50 +00:00
#else
drawcol = dc.col[g.bg];
Adding dynamic cursor color patch ref. #10
2021-02-26 13:33:03 +00:00
#endif // DYNAMIC_CURSOR_COLOR_PATCH
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#endif // SELECTION_COLORS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (g.mode & ATTR_HIGHLIGHT)
g.mode ^= ATTR_REVERSE;
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* draw the new one */
if (IS_SET(MODE_FOCUSED)) {
switch (win.cursor) {
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if !BLINKING_CURSOR_PATCH
Call xsetcursor to set win.cursor in main In xsetcursor, remove "DEFAULT(cursor, 1)" because 0 is a valid value. Increase max allowed value of cursor from 6 to 7 (st extension).
2020-05-24 15:19:24 +00:00
case 7: /* st extension */
g.u = 0x2603; /* snowman (U+2603) */
code-style: add fallthrough comment Patch by Steve Ward, thanks.
2020-05-20 12:26:04 +00:00
/* FALLTHROUGH */
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#endif // BLINKING_CURSOR_PATCH
case 0: /* Blinking block */
case 1: /* Blinking block (default) */
#if BLINKING_CURSOR_PATCH
if (IS_SET(MODE_BLINK))
break;
/* FALLTHROUGH */
#endif // BLINKING_CURSOR_PATCH
case 2: /* Steady block */
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xdrawglyph(g, cx, cy);
break;
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
case 3: /* Blinking underline */
#if BLINKING_CURSOR_PATCH
if (IS_SET(MODE_BLINK))
break;
/* FALLTHROUGH */
#endif // BLINKING_CURSOR_PATCH
case 4: /* Steady underline */
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
#if ANYSIZE_PATCH
XftDrawRect(xw.draw, &drawcol,
win.hborderpx + cx * win.cw,
win.vborderpx + (cy + 1) * win.ch - \
cursorthickness,
win.cw, cursorthickness);
#else
XftDrawRect(xw.draw, &drawcol,
borderpx + cx * win.cw,
borderpx + (cy + 1) * win.ch - \
cursorthickness,
win.cw, cursorthickness);
#endif // ANYSIZE_PATCH
break;
case 5: /* Blinking bar */
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
if (IS_SET(MODE_BLINK))
break;
/* FALLTHROUGH */
#endif // BLINKING_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
case 6: /* Steady bar */
XftDrawRect(xw.draw, &drawcol,
#if ANYSIZE_PATCH
win.hborderpx + cx * win.cw,
win.vborderpx + cy * win.ch,
#else
borderpx + cx * win.cw,
borderpx + cy * win.ch,
#endif // ANYSIZE_PATCH
cursorthickness, win.ch);
break;
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
case 7: /* Blinking st cursor */
if (IS_SET(MODE_BLINK))
break;
/* FALLTHROUGH */
case 8: /* Steady st cursor */
g.u = stcursor;
xdrawglyph(g, cx, cy);
break;
#endif // BLINKING_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
} else {
XftDrawRect(xw.draw, &drawcol,
#if ANYSIZE_PATCH
win.hborderpx + cx * win.cw,
win.vborderpx + cy * win.ch,
#else
borderpx + cx * win.cw,
borderpx + cy * win.ch,
#endif // ANYSIZE_PATCH
win.cw - 1, 1);
XftDrawRect(xw.draw, &drawcol,
#if ANYSIZE_PATCH
win.hborderpx + cx * win.cw,
win.vborderpx + cy * win.ch,
#else
borderpx + cx * win.cw,
borderpx + cy * win.ch,
#endif // ANYSIZE_PATCH
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
#if ANYSIZE_PATCH
win.hborderpx + (cx + 1) * win.cw - 1,
win.vborderpx + cy * win.ch,
#else
borderpx + (cx + 1) * win.cw - 1,
borderpx + cy * win.ch,
#endif // ANYSIZE_PATCH
1, win.ch - 1);
XftDrawRect(xw.draw, &drawcol,
#if ANYSIZE_PATCH
win.hborderpx + cx * win.cw,
win.vborderpx + (cy + 1) * win.ch - 1,
#else
borderpx + cx * win.cw,
borderpx + (cy + 1) * win.ch - 1,
#endif // ANYSIZE_PATCH
win.cw, 1);
}
}
void
xsetenv(void)
{
char buf[sizeof(long) * 8 + 1];
snprintf(buf, sizeof(buf), "%lu", xw.win);
setenv("WINDOWID", buf, 1);
}
ST: Add WM_ICON_NAME property support Also added _NET_WM_ICON_NAME. https://git.suckless.org/st/commit/28b4c822c5c0acec300fdf15c6e3ede9f5e2335d.html#h0-1-11 https://git.suckless.org/st/commit/4ef0cbd8b9371f37f7d02ef37b5378b879e6b8bf.html#h0-0-3
2021-05-10 07:28:15 +00:00
void
xseticontitle(char *p)
{
XTextProperty prop;
DEFAULT(p, opt_title);
fix possible rare crash when Xutf8TextPropertyToTextList fails from the XmbTextListToTextProperty(3) man page: "If insufficient memory is available for the new value string, the functions return XNoMemory. If the current locale is not supported, the functions return XLocaleNotSupported. In both of these error cases, the functions do not set text_prop_return." Reported by Steffen Nurpmeso <steffen@sdaoden.eu>, thanks! Ref. https://git.suckless.org/st/commit/2f6e597ed871cff91c627850d03152cae5f45779.html
2021-08-24 13:01:03 +00:00
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop) != Success)
return;
ST: Add WM_ICON_NAME property support Also added _NET_WM_ICON_NAME. https://git.suckless.org/st/commit/28b4c822c5c0acec300fdf15c6e3ede9f5e2335d.html#h0-1-11 https://git.suckless.org/st/commit/4ef0cbd8b9371f37f7d02ef37b5378b879e6b8bf.html#h0-0-3
2021-05-10 07:28:15 +00:00
XSetWMIconName(xw.dpy, xw.win, &prop);
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname);
XFree(prop.value);
}
Adding the CSI 22, 23 patch
2021-08-18 08:07:42 +00:00
#if CSI_22_23_PATCH
void
xsettitle(char *p, int pop)
{
XTextProperty prop;
free(titlestack[tstki]);
if (pop) {
titlestack[tstki] = NULL;
tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE;
p = titlestack[tstki] ? titlestack[tstki] : opt_title;
} else if (p) {
titlestack[tstki] = xstrdup(p);
} else {
titlestack[tstki] = NULL;
p = opt_title;
}
fix possible rare crash when Xutf8TextPropertyToTextList fails from the XmbTextListToTextProperty(3) man page: "If insufficient memory is available for the new value string, the functions return XNoMemory. If the current locale is not supported, the functions return XLocaleNotSupported. In both of these error cases, the functions do not set text_prop_return." Reported by Steffen Nurpmeso <steffen@sdaoden.eu>, thanks! Ref. https://git.suckless.org/st/commit/2f6e597ed871cff91c627850d03152cae5f45779.html
2021-08-24 13:01:03 +00:00
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop) != Success)
return;
Adding the CSI 22, 23 patch
2021-08-18 08:07:42 +00:00
XSetWMName(xw.dpy, xw.win, &prop);
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
XFree(prop.value);
}
void
xpushtitle(void)
{
int tstkin = (tstki + 1) % TITLESTACKSIZE;
free(titlestack[tstkin]);
titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL;
tstki = tstkin;
}
void
xfreetitlestack(void)
{
for (int i = 0; i < LEN(titlestack); i++) {
free(titlestack[i]);
titlestack[i] = NULL;
}
}
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
xsettitle(char *p)
{
XTextProperty prop;
DEFAULT(p, opt_title);
fix possible rare crash when Xutf8TextPropertyToTextList fails from the XmbTextListToTextProperty(3) man page: "If insufficient memory is available for the new value string, the functions return XNoMemory. If the current locale is not supported, the functions return XLocaleNotSupported. In both of these error cases, the functions do not set text_prop_return." Reported by Steffen Nurpmeso <steffen@sdaoden.eu>, thanks! Ref. https://git.suckless.org/st/commit/2f6e597ed871cff91c627850d03152cae5f45779.html
2021-08-24 13:01:03 +00:00
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
&prop) != Success)
return;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XSetWMName(xw.dpy, xw.win, &prop);
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
XFree(prop.value);
}
Adding the CSI 22, 23 patch
2021-08-18 08:07:42 +00:00
#endif // CSI_22_23_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
int
xstartdraw(void)
{
Adding w3m patch
2020-06-14 18:04:27 +00:00
#if W3M_PATCH
if (IS_SET(MODE_VISIBLE))
XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0);
#endif // W3M_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return IS_SET(MODE_VISIBLE);
}
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
#if LIGATURES_PATCH && WIDE_GLYPHS_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
void
xdrawline(Line line, int x1, int y1, int x2)
{
int i, j, x, ox, numspecs;
Glyph new;
GlyphFontSeq *seq = xw.specseq;
XftGlyphFontSpec *specs = xw.specbuf;
/* Draw line in 2 passes: background and foreground. This way wide glyphs
won't get truncated (#223) */
/* background */
i = j = ox = 0;
for (x = x1; x < x2; x++) {
new = line[x];
if (new.mode == ATTR_WDUMMY)
continue;
if (selected(x, y1))
#if SELECTION_COLORS_PATCH
new.mode |= ATTR_SELECTED;
#else
new.mode ^= ATTR_REVERSE;
#endif // SELECTION_COLORS_PATCH
if ((i > 0) && ATTRCMP(seq[j].base, new)) {
numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
xdrawglyphfontspecs(specs, seq[j].base, numspecs, ox, y1, DRAW_BG, x - ox);
seq[j].charlen = x - ox;
seq[j++].numspecs = numspecs;
specs += numspecs;
i = 0;
}
if (i == 0) {
ox = x;
seq[j].ox= ox;
seq[j].base = new;
}
i++;
}
if (i > 0) {
numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
xdrawglyphfontspecs(specs, seq[j].base, numspecs, ox, y1, DRAW_BG, x2 - ox);
seq[j].charlen = x2 - ox;
seq[j++].numspecs = numspecs;
}
/* foreground */
specs = xw.specbuf;
for (i = 0; i < j; i++) {
xdrawglyphfontspecs(specs, seq[i].base, seq[i].numspecs, seq[i].ox, y1, DRAW_FG, seq[i].charlen);
specs += seq[i].numspecs;
}
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
kbds_drawstatusbar(y1);
#endif // KEYBOARDSELECT_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
}
#elif LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
xdrawline(Line line, int x1, int y1, int x2)
{
int i, x, ox, numspecs;
Glyph base, new;
ligatures: upgrading
2024-03-07 14:34:21 +00:00
XftGlyphFontSpec *specs = xw.specbuf;
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
ligatures: upgrading
2024-03-07 14:34:21 +00:00
i = ox = 0;
for (x = x1; x < x2; x++) {
new = line[x];
if (new.mode == ATTR_WDUMMY)
continue;
if (selected(x, y1))
#if SELECTION_COLORS_PATCH
new.mode |= ATTR_SELECTED;
#else
new.mode ^= ATTR_REVERSE;
#endif // SELECTION_COLORS_PATCH
if ((i > 0) && ATTRCMP(base, new)) {
numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x - ox);
ligatures: upgrading
2024-03-07 14:34:21 +00:00
i = 0;
}
if (i == 0) {
ox = x;
base = new;
}
i++;
}
if (i > 0) {
numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x2 - ox);
ligatures: upgrading
2024-03-07 14:34:21 +00:00
}
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
kbds_drawstatusbar(y1);
#endif // KEYBOARDSELECT_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
}
#elif WIDE_GLYPHS_PATCH
void
xdrawline(Line line, int x1, int y1, int x2)
{
int i, x, ox, numspecs, numspecs_cached;
Glyph base, new;
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
XftGlyphFontSpec *specs;
numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1);
/* Draw line in 2 passes: background and foreground. This way wide glyphs
won't get truncated (#223) */
for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) {
specs = xw.specbuf;
numspecs = numspecs_cached;
i = ox = 0;
for (x = x1; x < x2 && i < numspecs; x++) {
new = line[x];
if (new.mode == ATTR_WDUMMY)
continue;
if (selected(x, y1))
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#if SELECTION_COLORS_PATCH
new.mode |= ATTR_SELECTED;
#else
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
new.mode ^= ATTR_REVERSE;
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#endif // SELECTION_COLORS_PATCH
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
if (i > 0 && ATTRCMP(base, new)) {
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
specs += i;
numspecs -= i;
i = 0;
}
if (i == 0) {
ox = x;
base = new;
}
i++;
}
if (i > 0)
ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118
2024-03-10 21:18:05 +00:00
xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
Adding wide glyphs patch
2020-11-14 15:24:07 +00:00
}
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
kbds_drawstatusbar(y1);
#endif // KEYBOARDSELECT_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
}
#else // !WIDE_GLYPHS_PATCH and !LIGATURES_PATCH
void
xdrawline(Line line, int x1, int y1, int x2)
{
int i, x, ox, numspecs;
Glyph base, new;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
XftGlyphFontSpec *specs = xw.specbuf;
numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
i = ox = 0;
for (x = x1; x < x2 && i < numspecs; x++) {
new = line[x];
if (new.mode == ATTR_WDUMMY)
continue;
if (selected(x, y1))
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#if SELECTION_COLORS_PATCH
new.mode |= ATTR_SELECTED;
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
new.mode ^= ATTR_REVERSE;
Add selectioncolors patch (#110) https://st.suckless.org/patches/selectioncolors/ Closes #91
2024-02-28 13:34:06 +00:00
#endif // SELECTION_COLORS_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (i > 0 && ATTRCMP(base, new)) {
xdrawglyphfontspecs(specs, base, i, ox, y1);
specs += i;
numspecs -= i;
i = 0;
}
if (i == 0) {
ox = x;
base = new;
}
i++;
}
if (i > 0)
xdrawglyphfontspecs(specs, base, i, ox, y1);
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
kbds_drawstatusbar(y1);
#endif // KEYBOARDSELECT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#endif // WIDE_GLYPHS_PATCH | LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
xfinishdraw(void)
{
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
#if SIXEL_PATCH
Fix sixel issues and add a clearing sequence (#99) This patch fixes the following sixel issues: - The current sixel implementation cleared all cells from the left side of the image when the image was drawn. The fix only clears the cells where the image will be drawn. - The deletion routine didn't work correctly. In certain situations, it left the image or images undrawn. For example, if the first image was marked for deletion, it didn't draw the second one. - The drawing routine caused a high cpu usage, because XCopyArea() triggered the X server to send the NoExpose event, which caused sixels to be redrawn and the X server to send another NoExpose event and so on. This loop caused constant redraw of sixels and high cpu usage. The fix prevents the X server from sending GraphicsExpose and NoExpose events. The patch also adds a control sequence for removing sixels: Because the sixels are implemented as overlay images, they cannot be removed by clearing the underlaying cells. Therefore, we need a control sequence to remove them. I opted to choose ESC[6J as the control sequence because it is not used and the number refers to sixels. So when the lf file manager supports sixels [1], you can use the following minimal scripts to preview images in lf: previewer: #!/bin/sh case "$(readlink -f "$1")" in *.bmp|*.gif|*.jpg|*.jpeg|*.png|*.webp|*.six|*.svg|*.xpm) chafa -s "$(($2-3))x$3" -f sixels "$1" exit 1 ;; *) bat "$1" ;; esac cleaner: #!/bin/sh printf "\033[6J" >/dev/tty [1] https://github.com/gokcehan/lf/pull/1211
2023-06-12 14:02:19 +00:00
ImageList *im, *next;
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
Imlib_Image origin, scaled;
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
XGCValues gcvalues;
GC gc;
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
int width, height;
int x, x2, del;
Line line;
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
#endif // SIXEL_PATCH
#if SIXEL_PATCH
Fix sixel issues and add a clearing sequence (#99) This patch fixes the following sixel issues: - The current sixel implementation cleared all cells from the left side of the image when the image was drawn. The fix only clears the cells where the image will be drawn. - The deletion routine didn't work correctly. In certain situations, it left the image or images undrawn. For example, if the first image was marked for deletion, it didn't draw the second one. - The drawing routine caused a high cpu usage, because XCopyArea() triggered the X server to send the NoExpose event, which caused sixels to be redrawn and the X server to send another NoExpose event and so on. This loop caused constant redraw of sixels and high cpu usage. The fix prevents the X server from sending GraphicsExpose and NoExpose events. The patch also adds a control sequence for removing sixels: Because the sixels are implemented as overlay images, they cannot be removed by clearing the underlaying cells. Therefore, we need a control sequence to remove them. I opted to choose ESC[6J as the control sequence because it is not used and the number refers to sixels. So when the lf file manager supports sixels [1], you can use the following minimal scripts to preview images in lf: previewer: #!/bin/sh case "$(readlink -f "$1")" in *.bmp|*.gif|*.jpg|*.jpeg|*.png|*.webp|*.six|*.svg|*.xpm) chafa -s "$(($2-3))x$3" -f sixels "$1" exit 1 ;; *) bat "$1" ;; esac cleaner: #!/bin/sh printf "\033[6J" >/dev/tty [1] https://github.com/gokcehan/lf/pull/1211
2023-06-12 14:02:19 +00:00
for (im = term.images; im; im = next) {
next = im->next;
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
/* do not draw or process the image, if it is not visible */
if (im->x >= term.col || im->y >= term.row || im->y < 0)
Fix sixel issues and add a clearing sequence (#99) This patch fixes the following sixel issues: - The current sixel implementation cleared all cells from the left side of the image when the image was drawn. The fix only clears the cells where the image will be drawn. - The deletion routine didn't work correctly. In certain situations, it left the image or images undrawn. For example, if the first image was marked for deletion, it didn't draw the second one. - The drawing routine caused a high cpu usage, because XCopyArea() triggered the X server to send the NoExpose event, which caused sixels to be redrawn and the X server to send another NoExpose event and so on. This loop caused constant redraw of sixels and high cpu usage. The fix prevents the X server from sending GraphicsExpose and NoExpose events. The patch also adds a control sequence for removing sixels: Because the sixels are implemented as overlay images, they cannot be removed by clearing the underlaying cells. Therefore, we need a control sequence to remove them. I opted to choose ESC[6J as the control sequence because it is not used and the number refers to sixels. So when the lf file manager supports sixels [1], you can use the following minimal scripts to preview images in lf: previewer: #!/bin/sh case "$(readlink -f "$1")" in *.bmp|*.gif|*.jpg|*.jpeg|*.png|*.webp|*.six|*.svg|*.xpm) chafa -s "$(($2-3))x$3" -f sixels "$1" exit 1 ;; *) bat "$1" ;; esac cleaner: #!/bin/sh printf "\033[6J" >/dev/tty [1] https://github.com/gokcehan/lf/pull/1211
2023-06-12 14:02:19 +00:00
continue;
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
/* scale the image */
width = im->width * win.cw / im->cw;
height = im->height * win.ch / im->ch;
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
if (!im->pixmap) {
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
im->pixmap = (void *)XCreatePixmap(xw.dpy, xw.win, width, height,
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
#if ALPHA_PATCH
xw.depth
#else
DefaultDepth(xw.dpy, xw.scr)
#endif // ALPHA_PATCH
);
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
if (win.cw == im->cw && win.ch == im->ch) {
XImage ximage = {
.format = ZPixmap,
.data = (char *)im->pixels,
.width = im->width,
.height = im->height,
.xoffset = 0,
.byte_order = sixelbyteorder,
.bitmap_bit_order = MSBFirst,
.bits_per_pixel = 32,
.bytes_per_line = im->width * 4,
.bitmap_unit = 32,
.bitmap_pad = 32,
#if ALPHA_PATCH
.depth = xw.depth
#else
.depth = 24
#endif // ALPHA_PATCH
};
XPutImage(xw.dpy, (Drawable)im->pixmap, dc.gc, &ximage, 0, 0, 0, 0, width, height);
} else {
origin = imlib_create_image_using_data(im->width, im->height, (DATA32 *)im->pixels);
if (!origin)
continue;
imlib_context_set_image(origin);
imlib_image_set_has_alpha(1);
scaled = imlib_create_cropped_scaled_image(0, 0, im->width, im->height, width, height);
imlib_free_image_and_decache();
if (!scaled)
continue;
imlib_context_set_image(scaled);
imlib_image_set_has_alpha(1);
XImage ximage = {
.format = ZPixmap,
.data = (char *)imlib_image_get_data_for_reading_only(),
.width = width,
.height = height,
.xoffset = 0,
.byte_order = sixelbyteorder,
.bitmap_bit_order = MSBFirst,
.bits_per_pixel = 32,
.bytes_per_line = width * 4,
.bitmap_unit = 32,
.bitmap_pad = 32,
#if ALPHA_PATCH
.depth = xw.depth
#else
.depth = 24
#endif // ALPHA_PATCH
};
XPutImage(xw.dpy, (Drawable)im->pixmap, dc.gc, &ximage, 0, 0, 0, 0, width, height);
imlib_free_image_and_decache();
}
}
/* clip the image so it does not go over to borders */
x2 = MIN(im->x + im->cols, term.col);
width = MIN(width, (x2 - im->x) * win.cw);
/* delete the image if the text cells behind it have been changed */
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if SCROLLBACK_PATCH || REFLOW_PATCH
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
line = TLINE(im->y);
#else
line = term.line[im->y];
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#endif // SCROLLBACK_PATCH | REFLOW_PATCH
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
for (del = 0, x = im->x; x < x2; x++) {
if ((del = !(line[x].mode & ATTR_SIXEL)))
break;
}
if (del) {
delete_image(im);
continue;
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
}
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
/* draw the image */
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
memset(&gcvalues, 0, sizeof(gcvalues));
Fix sixel issues and add a clearing sequence (#99) This patch fixes the following sixel issues: - The current sixel implementation cleared all cells from the left side of the image when the image was drawn. The fix only clears the cells where the image will be drawn. - The deletion routine didn't work correctly. In certain situations, it left the image or images undrawn. For example, if the first image was marked for deletion, it didn't draw the second one. - The drawing routine caused a high cpu usage, because XCopyArea() triggered the X server to send the NoExpose event, which caused sixels to be redrawn and the X server to send another NoExpose event and so on. This loop caused constant redraw of sixels and high cpu usage. The fix prevents the X server from sending GraphicsExpose and NoExpose events. The patch also adds a control sequence for removing sixels: Because the sixels are implemented as overlay images, they cannot be removed by clearing the underlaying cells. Therefore, we need a control sequence to remove them. I opted to choose ESC[6J as the control sequence because it is not used and the number refers to sixels. So when the lf file manager supports sixels [1], you can use the following minimal scripts to preview images in lf: previewer: #!/bin/sh case "$(readlink -f "$1")" in *.bmp|*.gif|*.jpg|*.jpeg|*.png|*.webp|*.six|*.svg|*.xpm) chafa -s "$(($2-3))x$3" -f sixels "$1" exit 1 ;; *) bat "$1" ;; esac cleaner: #!/bin/sh printf "\033[6J" >/dev/tty [1] https://github.com/gokcehan/lf/pull/1211
2023-06-12 14:02:19 +00:00
gcvalues.graphics_exposures = False;
gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures, &gcvalues);
sixel + anysize patch compatibility fix ref. #117
2024-03-07 20:24:31 +00:00
#if ANYSIZE_PATCH
XCopyArea(xw.dpy, (Drawable)im->pixmap, xw.buf, gc, 0, 0,
width, height, win.hborderpx + im->x * win.cw, win.vborderpx + im->y * win.ch);
#else
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
XCopyArea(xw.dpy, (Drawable)im->pixmap, xw.buf, gc, 0, 0,
ligatures: upgrading
2024-03-07 14:34:21 +00:00
width, height, borderpx + im->x * win.cw, borderpx + im->y * win.ch);
sixel + anysize patch compatibility fix ref. #117
2024-03-07 20:24:31 +00:00
#endif // ANYSIZE_PATCH
Adding sixel support ref. #7
2021-03-10 17:09:47 +00:00
XFreeGC(xw.dpy, gc);
}
#endif // SIXEL_PATCH
Fix flickering when sixel images are moving
2022-06-07 21:51:58 +00:00
#if !SINGLE_DRAWABLE_BUFFER_PATCH
XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w, win.h, 0, 0);
#endif // SINGLE_DRAWABLE_BUFFER_PATCH
Reworking sixel implementation based on veltza's implementation (#117) * sixel: remove black bars from sixel images When the images don't fully cover the text cells, black bars are added to them. This fix removes those bars, but if you need the old behavior, you can restore it by setting 'sixelremovebars' to zero in config.h * sixel: fix a potential memory leak * sixel: improve behavior with text reflow * sixel: prevent animated gifs from choking the terminal Animated gifs constantly spawn new images that eventually choke the terminal because the old animation frames are kept in the image buffer. This fix removes overlapping images from the image buffer and prevents them from piling up. * sixel: add zooming and clipping * sixel: copying bulk of changes * sixel: move sixel_parser_parse() and add missing sequences and blocks (#113) - Move sixel_parser_parse() from tputc() to twrite() - Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences - Add more conditional blocks for the scrollback and sync patches - Remove unused reflow_y from ImageList. It is only used for the scrollback-reflow patch in st-sx. * sixel: update vtiden to VT200 family * sixel: fix scrolling issues inside tmux (#114) tmux is using the scrolling region and sequence to clear the screen below the shell prompt. This peculiar behavior caused the tscrollup() function to be called, which always scrolled the images regardless of whether they were inside the region or not. So the images moved out of place whenever the bottom of the screen was cleared. This fix checks that the images are inside the region before scrolling them. * sixel: prevent images from being deleted when resizing (#115) This fixes resizing issues outside of tmux not inside. * Rewriting tresize logic based on veltza's proposed implementation in PR #115 * tresize: correction for tscrollup call when scrollback patch is used --------- Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 08:22:44 +00:00
XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg].pixel);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
void
xximspot(int x, int y)
{
x: do not instantiate a new nested list on each cursor move (b67c9b)
2020-03-24 14:36:22 +00:00
if (xw.ime.xic == NULL)
return;
xw.ime.spot.x = borderpx + x * win.cw;
xw.ime.spot.y = borderpx + (y + 1) * win.ch;
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
x: do not instantiate a new nested list on each cursor move (b67c9b)
2020-03-24 14:36:22 +00:00
XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL);
better Input Method Editor (IME) support (35f7db)
2020-03-24 10:25:39 +00:00
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
void
expose(XEvent *ev)
{
redraw();
}
void
visibility(XEvent *ev)
{
XVisibilityEvent *e = &ev->xvisibility;
MODBIT(win.mode, e->state != VisibilityFullyObscured, MODE_VISIBLE);
}
void
unmap(XEvent *ev)
{
Adding st embedder patch
2020-01-07 07:05:00 +00:00
#if ST_EMBEDDER_PATCH
if (embed == ev->xunmap.window) {
embed = 0;
XRaiseWindow(xw.dpy, xw.win);
XSetInputFocus(xw.dpy, xw.win, RevertToParent, CurrentTime);
}
#endif // ST_EMBEDDER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
win.mode &= ~MODE_VISIBLE;
}
void
xsetpointermotion(int set)
{
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#if HIDECURSOR_PATCH
if (!set && !xw.pointerisvisible)
return;
#endif // HIDECURSOR_PATCH
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
set = 1; /* keep MotionNotify event enabled */
#endif // OPENURLONCLICK_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
}
void
xsetmode(int set, unsigned int flags)
{
int mode = win.mode;
MODBIT(win.mode, set, flags);
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#if SWAPMOUSE_PATCH
if ((flags & MODE_MOUSE)
#if HIDECURSOR_PATCH
&& xw.pointerisvisible
#endif // HIDECURSOR_PATCH
) {
if (win.mode & MODE_MOUSE)
XUndefineCursor(xw.dpy, xw.win);
else
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if HIDECURSOR_PATCH
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
#else
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
XDefineCursor(xw.dpy, xw.win, cursor);
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#endif // HIDECURSOR_PATCH
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
}
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#elif OPENURLONCLICK_PATCH
if (win.mode & MODE_MOUSE && xw.pointerisvisible)
XDefineCursor(xw.dpy, xw.win, xw.vpointer);
Adding swapmouse patch ref. #28
2021-05-16 09:40:15 +00:00
#endif // SWAPMOUSE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE))
redraw();
}
int
xsetcursor(int cursor)
{
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
if (!BETWEEN(cursor, 0, 8)) /* 7-8: st extensions */
#else
Call xsetcursor to set win.cursor in main In xsetcursor, remove "DEFAULT(cursor, 1)" because 0 is a valid value. Increase max allowed value of cursor from 6 to 7 (st extension).
2020-05-24 15:19:24 +00:00
if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#endif // BLINKING_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return 1;
Adding default cursor patch
2021-05-11 14:35:30 +00:00
#if DEFAULT_CURSOR_PATCH
#if BLINKING_CURSOR_PATCH
win.cursor = (cursor ? cursor : cursorstyle);
#else
win.cursor = (cursor ? cursor : cursorshape);
#endif // BLINKING_CURSOR_PATCH
#else
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
win.cursor = cursor;
Adding default cursor patch
2021-05-11 14:35:30 +00:00
#endif // DEFAULT_CURSOR_PATCH
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
cursorblinks = win.cursor == 0 || win.cursor == 1 ||
win.cursor == 3 || win.cursor == 5 ||
win.cursor == 7;
#endif // BLINKING_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return 0;
}
void
xseturgency(int add)
{
XWMHints *h = XGetWMHints(xw.dpy, xw.win);
MODBIT(h->flags, add, XUrgencyHint);
XSetWMHints(xw.dpy, xw.win, h);
XFree(h);
}
void
xbell(void)
{
if (!(IS_SET(MODE_FOCUSED)))
xseturgency(1);
if (bellvolume)
XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
Re-added visualbell patch
2020-08-08 16:09:00 +00:00
#if VISUALBELL_1_PATCH
if (!bellon) /* turn visual bell on */
bellon = 1;
#endif // VISUALBELL_1_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
void
focus(XEvent *ev)
{
XFocusChangeEvent *e = &ev->xfocus;
Adding st embedder patch
2020-01-07 07:05:00 +00:00
#if ST_EMBEDDER_PATCH
if (embed && ev->type == FocusIn) {
XRaiseWindow(xw.dpy, embed);
XSetInputFocus(xw.dpy, embed, RevertToParent, CurrentTime);
sendxembed(XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT, 0, 0);
sendxembed(XEMBED_WINDOW_ACTIVATE, 0, 0, 0);
}
#endif // ST_EMBEDDER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (e->mode == NotifyGrab)
return;
if (ev->type == FocusIn) {
x: check we still have an XIC context before accessing it (ce060a)
2020-03-24 14:37:28 +00:00
if (xw.ime.xic)
XSetICFocus(xw.ime.xic);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
win.mode |= MODE_FOCUSED;
xseturgency(0);
if (IS_SET(MODE_FOCUS))
ttywrite("\033[I", 3, 0);
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
if (!focused) {
focused = 1;
xloadcols();
alpha focus highlight: upgrade patch to latest (20200731-43a395a)
2022-10-06 11:19:31 +00:00
tfulldirt();
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
}
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
} else {
x: check we still have an XIC context before accessing it (ce060a)
2020-03-24 14:37:28 +00:00
if (xw.ime.xic)
XUnsetICFocus(xw.ime.xic);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
win.mode &= ~MODE_FOCUSED;
if (IS_SET(MODE_FOCUS))
ttywrite("\033[O", 3, 0);
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
if (focused) {
focused = 0;
xloadcols();
alpha focus highlight: upgrade patch to latest (20200731-43a395a)
2022-10-06 11:19:31 +00:00
tfulldirt();
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
}
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
}
int
match(uint mask, uint state)
{
return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
}
char*
kmap(KeySym k, uint state)
{
Key *kp;
int i;
/* Check for mapped keys out of X11 function keys. */
for (i = 0; i < LEN(mappedkeys); i++) {
if (mappedkeys[i] == k)
break;
}
if (i == LEN(mappedkeys)) {
if ((k & 0xFFFF) < 0xFD00)
return NULL;
}
for (kp = key; kp < key + LEN(key); kp++) {
if (kp->k != k)
continue;
if (!match(kp->mask, state))
continue;
if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
continue;
if (IS_SET(MODE_NUMLOCK) && kp->appkey == 2)
continue;
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
continue;
return kp->s;
}
return NULL;
}
void
kpress(XEvent *ev)
{
XKeyEvent *e = &ev->xkey;
Bump to e5e9598. fix buffer overflow when handling long composed input To reproduce the issue: " If you already have the multi-key enabled on your system, then add this line to your ~/.XCompose file: [...] <question> <T> <E> <S> <T> <question> : "1234567890123456789012345678901234567890123456789012345678901234567890" " Reported by and an initial patch by Andy Gozas <andy@gozas.me>, thanks! Adapted the patch, for now st (like dmenu) handles a fixed amount of composed characters, or otherwise ignores it. This is done for simplicity sake. Ref. https://git.suckless.org/st/commit/e5e959835b195c023d1f685ef4dbbcfc3b5120b2.html
2022-10-25 15:21:09 +00:00
KeySym ksym = NoSymbol;
Increase XmbLookupString buffer (f5fd0c)
2020-03-24 13:28:43 +00:00
char buf[64], *customkey;
Adding key and mouse binding option to control whether they apply to primary screen, alt screen or both ref. #81
2022-09-01 20:01:20 +00:00
int len, screen;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Rune c;
Status status;
Shortcut *bp;
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
#if HIDECURSOR_PATCH
hidecursor: add config option to disable hidecursor functionality
2024-03-07 20:43:18 +00:00
if (xw.pointerisvisible && hidecursor) {
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#if OPENURLONCLICK_PATCH
#if ANYSIZE_PATCH
int x = e->x - win.hborderpx;
int y = e->y - win.vborderpx;
#else
int x = e->x - borderpx;
int y = e->y - borderpx;
#endif // ANYSIZE_PATCH
LIMIT(x, 0, win.tw - 1);
LIMIT(y, 0, win.th - 1);
if (!detecturl(x / win.cw, y / win.ch, 0)) {
XDefineCursor(xw.dpy, xw.win, xw.bpointer);
xsetpointermotion(1);
xw.pointerisvisible = 0;
}
#else
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
XDefineCursor(xw.dpy, xw.win, xw.bpointer);
xsetpointermotion(1);
xw.pointerisvisible = 0;
Add scrollback support to the openurlonclick patch The openurlonclick and scrollback patches are now working together, so links can be clicked in the scrollback buffer too. This update also adds url underlining and other improvements to the openurlonclick patch. The full list of changes in the openurlonclick patch: - Adds scrollback support - Adds modkey option - Better url detection - Underlines url when the mouse pointer is over a link - Opens a browser as a background process, so it won't lock the terminal anymore - Fixes a segmentation fault bug
2022-08-07 14:21:55 +00:00
#endif // OPENURLONCLICK_PATCH
Adding fixime, newterm and opencopied patches
2019-09-16 10:40:07 +00:00
}
#endif // HIDECURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (IS_SET(MODE_KBDLOCK))
return;
Bump to e5e9598. fix buffer overflow when handling long composed input To reproduce the issue: " If you already have the multi-key enabled on your system, then add this line to your ~/.XCompose file: [...] <question> <T> <E> <S> <T> <question> : "1234567890123456789012345678901234567890123456789012345678901234567890" " Reported by and an initial patch by Andy Gozas <andy@gozas.me>, thanks! Adapted the patch, for now st (like dmenu) handles a fixed amount of composed characters, or otherwise ignores it. This is done for simplicity sake. Ref. https://git.suckless.org/st/commit/e5e959835b195c023d1f685ef4dbbcfc3b5120b2.html
2022-10-25 15:21:09 +00:00
if (xw.ime.xic) {
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
Bump to e5e9598. fix buffer overflow when handling long composed input To reproduce the issue: " If you already have the multi-key enabled on your system, then add this line to your ~/.XCompose file: [...] <question> <T> <E> <S> <T> <question> : "1234567890123456789012345678901234567890123456789012345678901234567890" " Reported by and an initial patch by Andy Gozas <andy@gozas.me>, thanks! Adapted the patch, for now st (like dmenu) handles a fixed amount of composed characters, or otherwise ignores it. This is done for simplicity sake. Ref. https://git.suckless.org/st/commit/e5e959835b195c023d1f685ef4dbbcfc3b5120b2.html
2022-10-25 15:21:09 +00:00
if (status == XBufferOverflow)
return;
} else {
x: fix XIM handling (8888e3)
2020-03-24 14:41:43 +00:00
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
Bump to e5e9598. fix buffer overflow when handling long composed input To reproduce the issue: " If you already have the multi-key enabled on your system, then add this line to your ~/.XCompose file: [...] <question> <T> <E> <S> <T> <question> : "1234567890123456789012345678901234567890123456789012345678901234567890" " Reported by and an initial patch by Andy Gozas <andy@gozas.me>, thanks! Adapted the patch, for now st (like dmenu) handles a fixed amount of composed characters, or otherwise ignores it. This is done for simplicity sake. Ref. https://git.suckless.org/st/commit/e5e959835b195c023d1f685ef4dbbcfc3b5120b2.html
2022-10-25 15:21:09 +00:00
}
Adding reflow patch (#120)
2024-03-13 09:33:51 +00:00
#if KEYBOARDSELECT_PATCH && REFLOW_PATCH
if (IS_SET(MODE_KBDSELECT) ) {
if (kbds_issearchmode()) {
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
if (ksym == bp->keysym && match(bp->mod, e->state) &&
(!bp->screen || bp->screen == screen) &&
(bp->func == clippaste || bp->func == selpaste)) {
bp->func(&(bp->arg));
return;
}
}
}
if (match(XK_NO_MOD, e->state) ||
(XK_Shift_L | XK_Shift_R) & e->state )
win.mode ^= kbds_keyboardhandler(ksym, buf, len, 0);
return;
}
#elif KEYBOARDSELECT_PATCH
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
if ( IS_SET(MODE_KBDSELECT) ) {
if ( match(XK_NO_MOD, e->state) ||
(XK_Shift_L | XK_Shift_R) & e->state )
win.mode ^= trt_kbdselect(ksym, buf, len);
return;
}
#endif // KEYBOARDSELECT_PATCH
Adding key and mouse binding option to control whether they apply to primary screen, alt screen or both ref. #81
2022-09-01 20:01:20 +00:00
screen = tisaltscr() ? S_ALT : S_PRI;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* 1. shortcuts */
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
Adding key and mouse binding option to control whether they apply to primary screen, alt screen or both ref. #81
2022-09-01 20:01:20 +00:00
if (ksym == bp->keysym && match(bp->mod, e->state) &&
(!bp->screen || bp->screen == screen)) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
bp->func(&(bp->arg));
return;
}
}
/* 2. custom keys from config.h */
if ((customkey = kmap(ksym, e->state))) {
ttywrite(customkey, strlen(customkey), 1);
return;
}
/* 3. composed string from input method */
if (len == 0)
return;
if (len == 1 && e->state & Mod1Mask) {
if (IS_SET(MODE_8BIT)) {
if (*buf < 0177) {
c = *buf | 0x80;
len = utf8encode(c, buf);
}
} else {
buf[1] = buf[0];
buf[0] = '\033';
len = 2;
}
}
ttywrite(buf, len, 1);
}
void
cmessage(XEvent *e)
{
/*
* See xembed specs
* http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
*/
if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
win.mode |= MODE_FOCUSED;
xseturgency(0);
} else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
win.mode &= ~MODE_FOCUSED;
}
} else if (e->xclient.data.l[0] == xw.wmdeletewin) {
ttyhangup();
exit(0);
}
}
void
resize(XEvent *e)
{
Adding st embedder patch
2020-01-07 07:05:00 +00:00
#if ST_EMBEDDER_PATCH
XWindowChanges wc;
#endif // ST_EMBEDDER_PATCH
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
if (pseudotransparency) {
if (e->xconfigure.width == win.w &&
e->xconfigure.height == win.h &&
e->xconfigure.x == win.x && e->xconfigure.y == win.y)
return;
updatexy();
} else
#endif // BACKGROUND_IMAGE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (e->xconfigure.width == win.w && e->xconfigure.height == win.h)
return;
Adding st embedder patch
2020-01-07 07:05:00 +00:00
#if ST_EMBEDDER_PATCH
if (embed) {
wc.width = e->xconfigure.width;
wc.height = e->xconfigure.height;
XConfigureWindow(xw.dpy, embed, CWWidth | CWHeight, &wc);
}
#endif // ST_EMBEDDER_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
cresize(e->xconfigure.width, e->xconfigure.height);
}
void
run(void)
{
XEvent ev;
int w = win.w, h = win.h;
fd_set rfd;
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
int xfd = XConnectionNumber(xw.dpy), ttyfd, xev, drawing;
struct timespec seltv, *tv, now, lastblink, trigger;
double timeout;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
/* Waiting for window mapping */
do {
XNextEvent(xw.dpy, &ev);
/*
* This XFilterEvent call is required because of XOpenIM. It
* does filter out the key event and some client message for
* the input method too.
*/
if (XFilterEvent(&ev, None))
continue;
if (ev.type == ConfigureNotify) {
w = ev.xconfigure.width;
h = ev.xconfigure.height;
}
} while (ev.type != MapNotify);
ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);
cresize(w, h);
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
for (timeout = -1, drawing = 0, lastblink = (struct timespec){0};;) {
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
FD_ZERO(&rfd);
FD_SET(ttyfd, &rfd);
FD_SET(xfd, &rfd);
Adding sync patch ref. #21
2021-05-09 07:25:22 +00:00
#if SYNC_PATCH
if (XPending(xw.dpy) || ttyread_pending())
#else
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
if (XPending(xw.dpy))
Adding sync patch ref. #21
2021-05-09 07:25:22 +00:00
#endif // SYNC_PATCH
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
timeout = 0; /* existing events might not set xfd */
seltv.tv_sec = timeout / 1E3;
seltv.tv_nsec = 1E6 * (timeout - 1E3 * seltv.tv_sec);
tv = timeout >= 0 ? &seltv : NULL;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
if (pselect(MAX(xfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
if (errno == EINTR)
continue;
die("select failed: %s\n", strerror(errno));
}
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
clock_gettime(CLOCK_MONOTONIC, &now);
Adding sync patch ref. #21
2021-05-09 07:25:22 +00:00
#if SYNC_PATCH
int ttyin = FD_ISSET(ttyfd, &rfd) || ttyread_pending();
if (ttyin)
ttyread();
#else
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
if (FD_ISSET(ttyfd, &rfd))
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
ttyread();
Adding sync patch ref. #21
2021-05-09 07:25:22 +00:00
#endif // SYNC_PATCH
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
xev = 0;
while (XPending(xw.dpy)) {
xev = 1;
XNextEvent(xw.dpy, &ev);
if (XFilterEvent(&ev, None))
continue;
if (handler[ev.type])
(handler[ev.type])(&ev);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
/*
* To reduce flicker and tearing, when new content or event
* triggers drawing, we first wait a bit to ensure we got
* everything, and if nothing new arrives - we draw.
* We start with trying to wait minlatency ms. If more content
tiny code-style and typo-fix in comment (df79f2)
2020-05-20 12:22:04 +00:00
* arrives sooner, we retry with shorter and shorter periods,
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
* and eventually draw even without idle after maxlatency ms.
* Typically this results in low latency while interacting,
* maximum latency intervals during `cat huge.txt`, and perfect
* sync with periodic updates from animations/key-repeats/etc.
*/
Adding sync patch ref. #21
2021-05-09 07:25:22 +00:00
#if SYNC_PATCH
if (ttyin || xev)
#else
if (FD_ISSET(ttyfd, &rfd) || xev)
#endif // SYNC_PATCH
{
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
if (!drawing) {
trigger = now;
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
if (IS_SET(MODE_BLINK)) {
win.mode ^= MODE_BLINK;
}
lastblink = now;
#endif // BLINKING_CURSOR_PATCH
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
drawing = 1;
}
timeout = (maxlatency - TIMEDIFF(now, trigger)) \
/ maxlatency * minlatency;
if (timeout > 0)
continue; /* we have time, try to find idle */
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
Adding sync patch ref. #21
2021-05-09 07:25:22 +00:00
#if SYNC_PATCH
if (tinsync(su_timeout)) {
/*
* on synchronized-update draw-suspension: don't reset
* drawing so that we draw ASAP once we can (just after
* ESU). it won't be too soon because we already can
* draw now but we skip. we set timeout > 0 to draw on
* SU-timeout even without new content.
*/
timeout = minlatency;
continue;
}
#endif // SYNC_PATCH
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
/* idle detected or maxlatency exhausted -> draw */
timeout = -1;
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
if (blinktimeout && (cursorblinks || tattrset(ATTR_BLINK)))
#else
if (blinktimeout && tattrset(ATTR_BLINK))
#endif // BLINKING_CURSOR_PATCH
{
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
timeout = blinktimeout - TIMEDIFF(now, lastblink);
if (timeout <= 0) {
if (-timeout > blinktimeout) /* start visible */
win.mode |= MODE_BLINK;
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
win.mode ^= MODE_BLINK;
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
tsetdirtattr(ATTR_BLINK);
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
lastblink = now;
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
timeout = blinktimeout;
Adding relativeborder, fix-keyboard-input, iso14755, visualbell, rightclicktoplumb, boxdraw and keyboard-select patches
2019-09-17 06:53:00 +00:00
}
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
Re-added visualbell patch
2020-08-08 16:09:00 +00:00
#if VISUALBELL_1_PATCH
if (bellon) {
bellon++;
bellon %= 3;
MODBIT(win.mode, !IS_SET(MODE_REVERSE), MODE_REVERSE);
redraw();
}
else
draw();
#else
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
draw();
Re-added visualbell patch
2020-08-08 16:09:00 +00:00
#endif // VISUALBELL_1_PATCH
auto-sync: draw on idle to avoid flicker/tearing st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-05-20 12:15:57 +00:00
XFlush(xw.dpy);
drawing = 0;
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
}
void
usage(void)
{
Adding workingdir patch
2020-03-29 14:46:38 +00:00
die("usage: %s [-aiv] [-c class]"
#if WORKINGDIR_PATCH
" [-d path]"
#endif // WORKINGDIR_PATCH
" [-f font] [-g geometry]"
ligatures: upgrading
2024-03-07 14:34:21 +00:00
" [-n name] [-o file]\n"
" [-T title] [-t title] [-w windowid]"
" [[-e] command [args ...]]\n"
" %s [-aiv] [-c class]"
Adding workingdir patch
2020-03-29 14:46:38 +00:00
#if WORKINGDIR_PATCH
" [-d path]"
#endif // WORKINGDIR_PATCH
" [-f font] [-g geometry]"
ligatures: upgrading
2024-03-07 14:34:21 +00:00
" [-n name] [-o file]\n"
" [-T title] [-t title] [-w windowid] -l line"
" [stty_args ...]\n", argv0, argv0);
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
}
int
main(int argc, char *argv[])
{
xw.l = xw.t = 0;
xw.isfixed = False;
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#if BLINKING_CURSOR_PATCH
xsetcursor(cursorstyle);
#else
Call xsetcursor to set win.cursor in main In xsetcursor, remove "DEFAULT(cursor, 1)" because 0 is a valid value. Increase max allowed value of cursor from 6 to 7 (st extension).
2020-05-24 15:19:24 +00:00
xsetcursor(cursorshape);
Adding blinking cursor patch ref. #20
2021-05-08 08:13:20 +00:00
#endif // BLINKING_CURSOR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
ARGBEGIN {
case 'a':
allowaltscreen = 0;
break;
#if ALPHA_PATCH
case 'A':
opt_alpha = EARGF(usage());
break;
#endif // ALPHA_PATCH
case 'c':
opt_class = EARGF(usage());
break;
Adding workingdir patch
2020-03-29 14:46:38 +00:00
#if WORKINGDIR_PATCH
case 'd':
opt_dir = EARGF(usage());
break;
#endif // WORKINGDIR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
case 'e':
if (argc > 0)
--argc, ++argv;
goto run;
case 'f':
opt_font = EARGF(usage());
break;
case 'g':
xw.gm = XParseGeometry(EARGF(usage()),
&xw.l, &xw.t, &cols, &rows);
break;
case 'i':
xw.isfixed = 1;
break;
case 'o':
opt_io = EARGF(usage());
break;
case 'l':
opt_line = EARGF(usage());
break;
case 'n':
opt_name = EARGF(usage());
break;
case 't':
case 'T':
opt_title = EARGF(usage());
break;
case 'w':
opt_embed = EARGF(usage());
break;
case 'v':
die("%s " VERSION "\n", argv0);
break;
default:
usage();
} ARGEND;
run:
if (argc > 0) /* eat all remaining arguments */
opt_cmd = argv;
if (!opt_title)
opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
Adding background image reload patch ref. pull request #62
2022-04-11 13:56:12 +00:00
#if XRESOURCES_PATCH && XRESOURCES_RELOAD_PATCH || BACKGROUND_IMAGE_PATCH && BACKGROUND_IMAGE_RELOAD_PATCH
signal(SIGUSR1, sigusr1_reload);
#endif // XRESOURCES_RELOAD_PATCH | BACKGROUND_IMAGE_RELOAD_PATCH
#if XRESOURCES_PATCH
Adding xresources patch
2019-09-16 12:21:09 +00:00
if (!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
ligatures - moving hbcreatebuffer out of xresources condition ref. #118
2024-03-10 22:40:32 +00:00
config_init(xw.dpy);
#endif // XRESOURCES_PATCH
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#if LIGATURES_PATCH
hbcreatebuffer();
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
cols = MAX(cols, 1);
rows = MAX(rows, 1);
Adding alpha-focus-highlight patch
2021-05-09 12:40:30 +00:00
#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
defaultbg = MAX(LEN(colorname), 256);
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
tnew(cols, rows);
xinit(cols, rows);
Adding background image patch
2022-03-10 10:37:49 +00:00
#if BACKGROUND_IMAGE_PATCH
bginit();
#endif // BACKGROUND_IMAGE_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
xsetenv();
selinit();
Adding workingdir patch
2020-03-29 14:46:38 +00:00
#if WORKINGDIR_PATCH
if (opt_dir && chdir(opt_dir))
die("Can't change to working directory %s\n", opt_dir);
#endif // WORKINGDIR_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
run();
ligatures: upgrading
2024-03-07 14:34:21 +00:00
#if LIGATURES_PATCH
hbdestroybuffer();
#endif // LIGATURES_PATCH
Initial commit, adding alpha and anysize patches
2019-09-16 07:35:57 +00:00
return 0;
}