Merge branch 'master' of github.com:LukeSmithxyz/st

This commit is contained in:
Luke Smith 2020-03-20 08:40:22 -04:00
commit 72c555f605
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252
3 changed files with 19 additions and 1 deletions

View File

@ -52,6 +52,13 @@ static unsigned int actionfps = 30;
*/ */
static unsigned int blinktimeout = 800; static unsigned int blinktimeout = 800;
/*
* interval (in milliseconds) between each successive call to ximspot. This
* improves terminal performance while not reducing functionality to those
* whom need XIM support.
*/
int ximspot_update_interval = 1000;
/* /*
* thickness of underline and bar cursors * thickness of underline and bar cursors
*/ */
@ -187,6 +194,7 @@ ResourcePref resources[] = {
{ "cwscale", FLOAT, &cwscale }, { "cwscale", FLOAT, &cwscale },
{ "chscale", FLOAT, &chscale }, { "chscale", FLOAT, &chscale },
{ "alpha", FLOAT, &alpha }, { "alpha", FLOAT, &alpha },
{ "ximspot_update_interval", INTEGER, &ximspot_update_interval },
}; };
/* /*

11
st.c
View File

@ -14,6 +14,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <termios.h> #include <termios.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <wchar.h> #include <wchar.h>
@ -142,6 +143,7 @@ typedef struct {
int charset; /* current charset */ int charset; /* current charset */
int icharset; /* selected charset for sequence */ int icharset; /* selected charset for sequence */
int *tabs; int *tabs;
struct timespec last_ximspot_update;
} Term; } Term;
/* CSI Escape sequence structs */ /* CSI Escape sequence structs */
@ -1056,6 +1058,7 @@ void
tnew(int col, int row) tnew(int col, int row)
{ {
term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
clock_gettime(CLOCK_MONOTONIC, &term.last_ximspot_update);
tresize(col, row); tresize(col, row);
treset(); treset();
} }
@ -2744,7 +2747,13 @@ draw(void)
term.ocx, term.ocy, term.line[term.ocy][term.ocx]); term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
term.ocx = cx, term.ocy = term.c.y; term.ocx = cx, term.ocy = term.c.y;
xfinishdraw(); xfinishdraw();
xximspot(term.ocx, term.ocy);
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
if (ximspot_update_interval && TIMEDIFF(now, term.last_ximspot_update) > ximspot_update_interval) {
xximspot(term.ocx, term.ocy);
term.last_ximspot_update = now;
}
} }
void void

1
st.h
View File

@ -133,3 +133,4 @@ extern unsigned int defaultfg;
extern unsigned int defaultbg; extern unsigned int defaultbg;
extern float alpha; extern float alpha;
extern MouseKey mkeys[]; extern MouseKey mkeys[];
extern int ximspot_update_interval;