X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/b0310fba5de0c519eae0c8a2817ccc7bfcdd5222..a8cb8e94547d7e31441d2444e8a196415e3e4c1f:/st.c
diff --git a/st.c b/st.c
index 79bb6aa..cf8687e 100644
--- a/st.c
+++ b/st.c
@@ -3,40 +3,22 @@
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
-#include <locale.h>
#include <pwd.h>
#include <stdarg.h>
-#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
-#include <stdint.h>
#include <sys/ioctl.h>
#include <sys/select.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <time.h>
+#include <termios.h>
#include <unistd.h>
-#include <libgen.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xft/Xft.h>
-#include <X11/XKBlib.h>
-#include <fontconfig/fontconfig.h>
#include <wchar.h>
-#include "arg.h"
-
-char *argv0;
-
-#define Glyph Glyph_
-#define Font Font_
+#include "st.h"
+#include "win.h"
#if defined(__linux)
#include <pty.h>
@@ -46,11 +28,6 @@ char *argv0;
#include <libutil.h>
#endif
-
-/* XEMBED messages */
-#define XEMBED_FOCUS_IN 4
-#define XEMBED_FOCUS_OUT 5
-
/* Arbitrary sizes */
#define UTF_INVALID 0xFFFD
#define UTF_SIZ 4
@@ -58,46 +35,23 @@ char *argv0;
#define ESC_ARG_SIZ 16
#define STR_BUF_SIZ ESC_BUF_SIZ
#define STR_ARG_SIZ ESC_ARG_SIZ
-#define DRAW_BUF_SIZ 20*1024
-#define XK_ANY_MOD UINT_MAX
-#define XK_NO_MOD 0
-#define XK_SWITCH_MOD (1<<13)
/* macros */
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
-#define LEN(a) (sizeof(a) / sizeof(a)[0])
-#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
-#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
-#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177')
-#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
-#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
-#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
-#define IS_SET(flag) ((term.mode & (flag)) != 0)
-#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)
-#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-
-#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
-#define IS_TRUECOL(x) (1 << 24 & (x))
-#define TRUERED(x) (((x) & 0xff0000) >> 8)
-#define TRUEGREEN(x) (((x) & 0xff00))
-#define TRUEBLUE(x) (((x) & 0xff) << 8)
-
-
-enum glyph_attribute {
- ATTR_NULL = 0,
- ATTR_BOLD = 1 << 0,
- ATTR_FAINT = 1 << 1,
- ATTR_ITALIC = 1 << 2,
- ATTR_UNDERLINE = 1 << 3,
- ATTR_BLINK = 1 << 4,
- ATTR_REVERSE = 1 << 5,
- ATTR_INVISIBLE = 1 << 6,
- ATTR_STRUCK = 1 << 7,
- ATTR_WRAP = 1 << 8,
- ATTR_WIDE = 1 << 9,
- ATTR_WDUMMY = 1 << 10,
+#define IS_SET(flag) ((term.mode & (flag)) != 0)
+#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177')
+#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
+#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
+#define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL)
+
+enum term_mode {
+ MODE_WRAP = 1 << 0,
+ MODE_INSERT = 1 << 1,
+ MODE_ALTSCREEN = 1 << 2,
+ MODE_CRLF = 1 << 3,
+ MODE_ECHO = 1 << 4,
+ MODE_PRINT = 1 << 5,
+ MODE_UTF8 = 1 << 6,
+ MODE_SIXEL = 1 << 7,
};
enum cursor_movement {
@@ -111,32 +65,6 @@ enum cursor_state {
CURSOR_ORIGIN = 2
};
-enum term_mode {
- MODE_WRAP = 1 << 0,
- MODE_INSERT = 1 << 1,
- MODE_APPKEYPAD = 1 << 2,
- MODE_ALTSCREEN = 1 << 3,
- MODE_CRLF = 1 << 4,
- MODE_MOUSEBTN = 1 << 5,
- MODE_MOUSEMOTION = 1 << 6,
- MODE_REVERSE = 1 << 7,
- MODE_KBDLOCK = 1 << 8,
- MODE_HIDE = 1 << 9,
- MODE_ECHO = 1 << 10,
- MODE_APPCURSOR = 1 << 11,
- MODE_MOUSESGR = 1 << 12,
- MODE_8BIT = 1 << 13,
- MODE_BLINK = 1 << 14,
- MODE_FBLINK = 1 << 15,
- MODE_FOCUS = 1 << 16,
- MODE_MOUSEX10 = 1 << 17,
- MODE_MOUSEMANY = 1 << 18,
- MODE_BRCKTPASTE = 1 << 19,
- MODE_PRINT = 1 << 20,
- MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
- |MODE_MOUSEMANY,
-};
-
enum charset {
CS_GRAPHIC0,
CS_GRAPHIC1,
@@ -150,45 +78,14 @@ enum charset {
enum escape_state {
ESC_START = 1,
ESC_CSI = 2,
- ESC_STR = 4, /* DCS, OSC, PM, APC */
+ ESC_STR = 4, /* OSC, PM, APC */
ESC_ALTCHARSET = 8,
ESC_STR_END = 16, /* a final string was encountered */
ESC_TEST = 32, /* Enter in test mode */
+ ESC_UTF8 = 64,
+ ESC_DCS =128,
};
-enum window_state {
- WIN_VISIBLE = 1,
- WIN_REDRAW = 2,
- WIN_FOCUSED = 4
-};
-
-enum selection_type {
- SEL_REGULAR = 1,
- SEL_RECTANGULAR = 2
-};
-
-enum selection_snap {
- SNAP_WORD = 1,
- SNAP_LINE = 2
-};
-
-typedef unsigned char uchar;
-typedef unsigned int uint;
-typedef unsigned long ulong;
-typedef unsigned short ushort;
-
-typedef XftDraw *Draw;
-typedef XftColor Color;
-
-typedef struct {
- char c[UTF_SIZ]; /* character code */
- ushort mode; /* attribute flags */
- uint32_t fg; /* foreground */
- uint32_t bg; /* background */
-} Glyph;
-
-typedef Glyph *Line;
-
typedef struct {
Glyph attr; /* current char attributes */
int x;
@@ -196,26 +93,23 @@ typedef struct {
char state;
} TCursor;
-/* CSI Escape sequence structs */
-/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
typedef struct {
- char buf[ESC_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
- char priv;
- int arg[ESC_ARG_SIZ];
- int narg; /* nb of args */
- char mode[2];
-} CSIEscape;
+ int mode;
+ int type;
+ int snap;
+ /*
+ * Selection variables:
+ * nb â normalized coordinates of the beginning of the selection
+ * ne â normalized coordinates of the end of the selection
+ * ob â original coordinates of the beginning of the selection
+ * oe â original coordinates of the end of the selection
+ */
+ struct {
+ int x, y;
+ } nb, ne, ob, oe;
-/* STR Escape sequence structs */
-/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
-typedef struct {
- char type; /* ESC type ... */
- char buf[STR_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
- char *args[STR_ARG_SIZ];
- int narg; /* nb of args */
-} STREscape;
+ int alt;
+} Selection;
/* Internal representation of the screen */
typedef struct {
@@ -223,8 +117,10 @@ typedef struct {
int col; /* nb col */
Line *line; /* screen */
Line *alt; /* alternate screen */
- bool *dirty; /* dirtyness of lines */
+ int *dirty; /* dirtyness of lines */
TCursor c; /* cursor */
+ int ocx; /* old cursor col */
+ int ocy; /* old cursor row */
int top; /* top scroll limit */
int bot; /* bottom scroll limit */
int mode; /* terminal mode flags */
@@ -232,128 +128,34 @@ typedef struct {
char trantbl[4]; /* charset table translation */
int charset; /* current charset */
int icharset; /* selected charset for sequence */
- bool numlock; /* lock numbers in keyboard */
- bool *tabs;
+ int *tabs;
} Term;
-/* Purely graphic info */
-typedef struct {
- Display *dpy;
- Colormap cmap;
- Window win;
- Drawable buf;
- Atom xembed, wmdeletewin, netwmname, netwmpid;
- XIM xim;
- XIC xic;
- Draw draw;
- Visual *vis;
- XSetWindowAttributes attrs;
- int scr;
- bool isfixed; /* is fixed geometry? */
- int l, t; /* left and top offset */
- int gm; /* geometry mask */
- int tw, th; /* tty width and height */
- int w, h; /* window width and height */
- int ch; /* char height */
- int cw; /* char width */
- char state; /* focus, redraw, visible */
- int cursor; /* cursor style */
-} XWindow;
-
-typedef struct {
- uint b;
- uint mask;
- char *s;
-} Mousekey;
-
+/* CSI Escape sequence structs */
+/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
typedef struct {
- KeySym k;
- uint mask;
- char *s;
- /* three valued logic variables: 0 indifferent, 1 on, -1 off */
- signed char appkey; /* application keypad */
- signed char appcursor; /* application cursor */
- signed char crlf; /* crlf mode */
-} Key;
+ char buf[ESC_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
+ char priv;
+ int arg[ESC_ARG_SIZ];
+ int narg; /* nb of args */
+ char mode[2];
+} CSIEscape;
+/* STR Escape sequence structs */
+/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
typedef struct {
- int mode;
- int type;
- int snap;
- /*
- * Selection variables:
- * nb â normalized coordinates of the beginning of the selection
- * ne â normalized coordinates of the end of the selection
- * ob â original coordinates of the beginning of the selection
- * oe â original coordinates of the end of the selection
- */
- struct {
- int x, y;
- } nb, ne, ob, oe;
-
- char *primary, *clipboard;
- Atom xtarget;
- bool alt;
- struct timespec tclick1;
- struct timespec tclick2;
-} Selection;
-
-typedef union {
- int i;
- uint ui;
- float f;
- const void *v;
-} Arg;
+ char type; /* ESC type ... */
+ char buf[STR_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
+ char *args[STR_ARG_SIZ];
+ int narg; /* nb of args */
+} STREscape;
-typedef struct {
- uint mod;
- KeySym keysym;
- void (*func)(const Arg *);
- const Arg arg;
-} Shortcut;
-
-/* 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 *);
-static void xzoom(const Arg *);
-static void xzoomabs(const Arg *);
-static void xzoomreset(const Arg *);
-static void printsel(const Arg *);
-static void printscreen(const Arg *) ;
-static void toggleprinter(const Arg *);
-
-/* Config.h for applying patches and the configuration. */
-#include "config.h"
-
-/* Font structure */
-typedef struct {
- int height;
- int width;
- int ascent;
- int descent;
- short lbearing;
- short rbearing;
- XftFont *match;
- FcFontSet *set;
- FcPattern *pattern;
-} Font;
-
-/* Drawing Context */
-typedef struct {
- Color col[MAX(LEN(colorname), 256)];
- Font font, bfont, ifont, ibfont;
- GC gc;
-} DC;
-
-static void die(const char *, ...);
-static void draw(void);
-static void redraw(void);
-static void drawregion(int, int, int, int);
-static void execsh(void);
+static void execsh(char *, char **);
+static void stty(char **);
static void sigchld(int);
-static void run(void);
+static void ttywriteraw(const char *, size_t);
static void csidump(void);
static void csihandle(void);
@@ -365,7 +167,6 @@ static void strhandle(void);
static void strparse(void);
static void strreset(void);
-static int tattrset(int);
static void tprinter(char *, size_t);
static void tdumpsel(void);
static void tdumpline(int);
@@ -379,326 +180,325 @@ static void tinsertblankline(int);
static int tlinelen(int);
static void tmoveto(int, int);
static void tmoveato(int, int);
-static void tnew(int, int);
static void tnewline(int);
static void tputtab(int);
-static void tputc(char *, int);
+static void tputc(Rune);
static void treset(void);
-static void tresize(int, int);
static void tscrollup(int, int);
static void tscrolldown(int, int);
static void tsetattr(int *, int);
-static void tsetchar(char *, Glyph *, int, int);
+static void tsetchar(Rune, Glyph *, int, int);
+static void tsetdirt(int, int);
static void tsetscroll(int, int);
static void tswapscreen(void);
-static void tsetdirt(int, int);
-static void tsetdirtattr(int);
-static void tsetmode(bool, bool, int *, int);
+static void tsetmode(int, int, int *, int);
+static int twrite(const char *, int, int);
static void tfulldirt(void);
-static void techo(char *, int);
static void tcontrolcode(uchar );
static void tdectest(char );
+static void tdefutf8(char);
static int32_t tdefcolor(int *, int *, int);
static void tdeftran(char);
-static inline bool match(uint, uint);
-static void ttynew(void);
-static void ttyread(void);
-static void ttyresize(void);
-static void ttysend(char *, size_t);
-static void ttywrite(const char *, size_t);
static void tstrsequence(uchar);
-static inline ushort sixd_to_16bit(int);
-static void xdraws(char *, Glyph, int, int, int, int);
-static void xhints(void);
-static void xclear(int, int, int, int);
-static void xdrawcursor(void);
-static void xinit(void);
-static void xloadcols(void);
-static int xsetcolorname(int, const char *);
-static int xgeommasktogravity(int);
-static int xloadfont(Font *, FcPattern *);
-static void xloadfonts(char *, double);
-static void xsettitle(char *);
-static void xresettitle(void);
-static void xsetpointermotion(int);
-static void xseturgency(int);
-static void xsetsel(char *);
-static void xtermclear(int, int, int, int);
-static void xunloadfont(Font *);
-static void xunloadfonts(void);
-static void xresize(int, int);
-
-static void expose(XEvent *);
-static void visibility(XEvent *);
-static void unmap(XEvent *);
-static char *kmap(KeySym, uint);
-static void kpress(XEvent *);
-static void cmessage(XEvent *);
-static void cresize(int, int);
-static void resize(XEvent *);
-static void focus(XEvent *);
-static void brelease(XEvent *);
-static void bpress(XEvent *);
-static void bmotion(XEvent *);
-static void selnotify(XEvent *);
-static void selclear(XEvent *);
-static void selrequest(XEvent *);
-
-static void selinit(void);
+static void drawregion(int, int, int, int);
+
static void selnormalize(void);
-static inline bool selected(int, int);
-static char *getsel(void);
-static void selcopy(void);
static void selscroll(int, int);
-static void selsnap(int, int *, int *, int);
-static int x2col(int);
-static int y2row(int);
-static void getbuttoninfo(XEvent *);
-static void mousereport(XEvent *);
-
-static size_t utf8decode(char *, long *, size_t);
-static long utf8decodebyte(char, size_t *);
-static size_t utf8encode(long, char *, size_t);
-static char utf8encodebyte(long, size_t);
-static size_t utf8len(char *);
-static size_t utf8validate(long *, size_t);
+static void selsnap(int *, int *, int);
+
+static size_t utf8decode(const char *, Rune *, size_t);
+static Rune utf8decodebyte(char, size_t *);
+static char utf8encodebyte(Rune, size_t);
+static char *utf8strchr(char *, Rune);
+static size_t utf8validate(Rune *, size_t);
+
+static char *base64dec(const char *);
+static char base64dec_getc(const char **);
static ssize_t xwrite(int, const char *, size_t);
-static void *xmalloc(size_t);
-static void *xrealloc(void *, size_t);
-static char *xstrdup(char *);
-
-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,
- [SelectionRequest] = selrequest,
-};
/* Globals */
-static DC dc;
-static XWindow xw;
static Term term;
+static Selection sel;
static CSIEscape csiescseq;
static STREscape strescseq;
+static int iofd = 1;
static int cmdfd;
static pid_t pid;
-static Selection sel;
-static int iofd = STDOUT_FILENO;
-static char **opt_cmd = NULL;
-static char *opt_io = NULL;
-static char *opt_title = NULL;
-static char *opt_embed = NULL;
-static char *opt_class = NULL;
-static char *opt_font = NULL;
-static int oldbutton = 3; /* button event on startup: 3 = release */
-
-static char *usedfont = NULL;
-static double usedfontsize = 0;
-static double defaultfontsize = 0;
static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
-static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-/* Font Ring Cache */
-enum {
- FRC_NORMAL,
- FRC_ITALIC,
- FRC_BOLD,
- FRC_ITALICBOLD
-};
-
-typedef struct {
- XftFont *font;
- int flags;
- long unicodep;
-} Fontcache;
-
-/* Fontcache is an array now. A new font will be appended to the array. */
-static Fontcache frc[16];
-static int frclen = 0;
+static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
+static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
ssize_t
-xwrite(int fd, const char *s, size_t len) {
+xwrite(int fd, const char *s, size_t len)
+{
size_t aux = len;
+ ssize_t r;
- while(len > 0) {
- ssize_t r = write(fd, s, len);
- if(r < 0)
+ while (len > 0) {
+ r = write(fd, s, len);
+ if (r < 0)
return r;
len -= r;
s += r;
}
+
return aux;
}
void *
-xmalloc(size_t len) {
- void *p = malloc(len);
+xmalloc(size_t len)
+{
+ void *p;
- if(!p)
- die("Out of memory\n");
+ if (!(p = malloc(len)))
+ die("malloc: %s\n", strerror(errno));
return p;
}
void *
-xrealloc(void *p, size_t len) {
- if((p = realloc(p, len)) == NULL)
- die("Out of memory\n");
+xrealloc(void *p, size_t len)
+{
+ if ((p = realloc(p, len)) == NULL)
+ die("realloc: %s\n", strerror(errno));
return p;
}
char *
-xstrdup(char *s) {
- if((s = strdup(s)) == NULL)
- die("Out of memory\n");
+xstrdup(char *s)
+{
+ if ((s = strdup(s)) == NULL)
+ die("strdup: %s\n", strerror(errno));
return s;
}
size_t
-utf8decode(char *c, long *u, size_t clen) {
+utf8decode(const char *c, Rune *u, size_t clen)
+{
size_t i, j, len, type;
- long udecoded;
+ Rune udecoded;
*u = UTF_INVALID;
- if(!clen)
+ if (!clen)
return 0;
udecoded = utf8decodebyte(c[0], &len);
- if(!BETWEEN(len, 1, UTF_SIZ))
+ if (!BETWEEN(len, 1, UTF_SIZ))
return 1;
- for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+ for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
- if(type != 0)
+ if (type != 0)
return j;
}
- if(j < len)
+ if (j < len)
return 0;
*u = udecoded;
utf8validate(u, len);
+
return len;
}
-long
-utf8decodebyte(char c, size_t *i) {
- for(*i = 0; *i < LEN(utfmask); ++(*i))
- if(((uchar)c & utfmask[*i]) == utfbyte[*i])
+Rune
+utf8decodebyte(char c, size_t *i)
+{
+ for (*i = 0; *i < LEN(utfmask); ++(*i))
+ if (((uchar)c & utfmask[*i]) == utfbyte[*i])
return (uchar)c & ~utfmask[*i];
+
return 0;
}
size_t
-utf8encode(long u, char *c, size_t clen) {
+utf8encode(Rune u, char *c)
+{
size_t len, i;
len = utf8validate(&u, 0);
- if(clen < len)
+ if (len > UTF_SIZ)
return 0;
- for(i = len - 1; i != 0; --i) {
+
+ for (i = len - 1; i != 0; --i) {
c[i] = utf8encodebyte(u, 0);
u >>= 6;
}
c[0] = utf8encodebyte(u, len);
+
return len;
}
char
-utf8encodebyte(long u, size_t i) {
+utf8encodebyte(Rune u, size_t i)
+{
return utfbyte[i] | (u & ~utfmask[i]);
}
-size_t
-utf8len(char *c) {
- return utf8decode(c, &(long){0}, UTF_SIZ);
+char *
+utf8strchr(char *s, Rune u)
+{
+ Rune r;
+ size_t i, j, len;
+
+ len = strlen(s);
+ for (i = 0, j = 0; i < len; i += j) {
+ if (!(j = utf8decode(&s[i], &r, len - i)))
+ break;
+ if (r == u)
+ return &(s[i]);
+ }
+
+ return NULL;
}
size_t
-utf8validate(long *u, size_t i) {
- if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+utf8validate(Rune *u, size_t i)
+{
+ if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID;
- for(i = 1; *u > utfmax[i]; ++i)
+ for (i = 1; *u > utfmax[i]; ++i)
;
+
return i;
}
+static const char base64_digits[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0,
+ 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, -1, 0, 0, 0, 0, 1,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+char
+base64dec_getc(const char **src)
+{
+ while (**src && !isprint(**src)) (*src)++;
+ return *((*src)++);
+}
+
+char *
+base64dec(const char *src)
+{
+ size_t in_len = strlen(src);
+ char *result, *dst;
+
+ if (in_len % 4)
+ in_len += 4 - (in_len % 4);
+ result = dst = xmalloc(in_len / 4 * 3 + 1);
+ while (*src) {
+ int a = base64_digits[(unsigned char) base64dec_getc(&src)];
+ int b = base64_digits[(unsigned char) base64dec_getc(&src)];
+ int c = base64_digits[(unsigned char) base64dec_getc(&src)];
+ int d = base64_digits[(unsigned char) base64dec_getc(&src)];
+
+ *dst++ = (a << 2) | ((b & 0x30) >> 4);
+ if (c == -1)
+ break;
+ *dst++ = ((b & 0x0f) << 4) | ((c & 0x3c) >> 2);
+ if (d == -1)
+ break;
+ *dst++ = ((c & 0x03) << 6) | d;
+ }
+ *dst = '\0';
+ return result;
+}
+
void
-selinit(void) {
- memset(&sel.tclick1, 0, sizeof(sel.tclick1));
- memset(&sel.tclick2, 0, sizeof(sel.tclick2));
- sel.mode = 0;
+selinit(void)
+{
+ sel.mode = SEL_IDLE;
+ sel.snap = 0;
sel.ob.x = -1;
- sel.primary = NULL;
- sel.clipboard = NULL;
- sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
- if(sel.xtarget == None)
- sel.xtarget = XA_STRING;
}
int
-x2col(int x) {
- x -= borderpx;
- x /= xw.cw;
+tlinelen(int y)
+{
+ int i = term.col;
+
+ if (term.line[y][i - 1].mode & ATTR_WRAP)
+ return i;
+
+ while (i > 0 && term.line[y][i - 1].u == ' ')
+ --i;
- return LIMIT(x, 0, term.col-1);
+ return i;
}
-int
-y2row(int y) {
- y -= borderpx;
- y /= xw.ch;
+void
+selstart(int col, int row, int snap)
+{
+ selclear();
+ sel.mode = SEL_EMPTY;
+ sel.type = SEL_REGULAR;
+ sel.alt = IS_SET(MODE_ALTSCREEN);
+ sel.snap = snap;
+ sel.oe.x = sel.ob.x = col;
+ sel.oe.y = sel.ob.y = row;
+ selnormalize();
- return LIMIT(y, 0, term.row-1);
+ if (sel.snap != 0)
+ sel.mode = SEL_READY;
+ tsetdirt(sel.nb.y, sel.ne.y);
}
-int tlinelen(int y) {
- int i = term.col;
+void
+selextend(int col, int row, int type, int done)
+{
+ int oldey, oldex, oldsby, oldsey, oldtype;
- if(term.line[y][i - 1].mode & ATTR_WRAP)
- return i;
+ if (sel.mode == SEL_IDLE)
+ return;
+ if (done && sel.mode == SEL_EMPTY) {
+ selclear();
+ return;
+ }
- while(i > 0 && term.line[y][i - 1].c[0] == ' ')
- --i;
+ oldey = sel.oe.y;
+ oldex = sel.oe.x;
+ oldsby = sel.nb.y;
+ oldsey = sel.ne.y;
+ oldtype = sel.type;
- return i;
+ sel.oe.x = col;
+ sel.oe.y = row;
+ selnormalize();
+ sel.type = type;
+
+ if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
+ tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+
+ sel.mode = done ? SEL_IDLE : SEL_READY;
}
void
-selnormalize(void) {
+selnormalize(void)
+{
int i;
- if(sel.ob.y == sel.oe.y || sel.type == SEL_RECTANGULAR) {
- sel.nb.x = MIN(sel.ob.x, sel.oe.x);
- sel.ne.x = MAX(sel.ob.x, sel.oe.x);
- } else {
+ if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+ } else {
+ sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+ sel.ne.x = MAX(sel.ob.x, sel.oe.x);
}
sel.nb.y = MIN(sel.ob.y, sel.oe.y);
sel.ne.y = MAX(sel.ob.y, sel.oe.y);
- selsnap(sel.snap, &sel.nb.x, &sel.nb.y, -1);
- selsnap(sel.snap, &sel.ne.x, &sel.ne.y, +1);
+ selsnap(&sel.nb.x, &sel.nb.y, -1);
+ selsnap(&sel.ne.x, &sel.ne.y, +1);
/* expand selection over line breaks */
if (sel.type == SEL_RECTANGULAR)
@@ -710,9 +510,14 @@ selnormalize(void) {
sel.ne.x = term.col - 1;
}
-bool
-selected(int x, int y) {
- if(sel.type == SEL_RECTANGULAR)
+int
+selected(int x, int y)
+{
+ if (sel.mode == SEL_EMPTY || sel.ob.x == -1 ||
+ sel.alt != IS_SET(MODE_ALTSCREEN))
+ return 0;
+
+ if (sel.type == SEL_RECTANGULAR)
return BETWEEN(y, sel.nb.y, sel.ne.y)
&& BETWEEN(x, sel.nb.x, sel.ne.x);
@@ -722,33 +527,34 @@ selected(int x, int y) {
}
void
-selsnap(int mode, int *x, int *y, int direction) {
+selsnap(int *x, int *y, int direction)
+{
int newx, newy, xt, yt;
- bool delim, prevdelim;
+ int delim, prevdelim;
Glyph *gp, *prevgp;
- switch(mode) {
+ switch (sel.snap) {
case SNAP_WORD:
/*
* Snap around if the word wraps around at the end or
* beginning of a line.
*/
prevgp = &term.line[*y][*x];
- prevdelim = strchr(worddelimiters, prevgp->c[0]) != NULL;
- for(;;) {
+ prevdelim = ISDELIM(prevgp->u);
+ for (;;) {
newx = *x + direction;
newy = *y;
- if(!BETWEEN(newx, 0, term.col - 1)) {
+ if (!BETWEEN(newx, 0, term.col - 1)) {
newy += direction;
newx = (newx + term.col) % term.col;
if (!BETWEEN(newy, 0, term.row - 1))
break;
- if(direction > 0)
+ if (direction > 0)
yt = *y, xt = *x;
else
yt = newy, xt = newx;
- if(!(term.line[yt][xt].mode & ATTR_WRAP))
+ if (!(term.line[yt][xt].mode & ATTR_WRAP))
break;
}
@@ -756,9 +562,9 @@ selsnap(int mode, int *x, int *y, int direction) {
break;
gp = &term.line[newy][newx];
- delim = strchr(worddelimiters, gp->c[0]) != NULL;
- if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
- || (delim && gp->c[0] != prevgp->c[0])))
+ delim = ISDELIM(gp->u);
+ if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+ || (delim && gp->u != prevgp->u)))
break;
*x = newx;
@@ -774,16 +580,16 @@ selsnap(int mode, int *x, int *y, int direction) {
* previous line will be selected.
*/
*x = (direction < 0) ? 0 : term.col - 1;
- if(direction < 0 && *y > 0) {
- for(; *y > 0; *y += direction) {
- if(!(term.line[*y-1][term.col-1].mode
+ if (direction < 0) {
+ for (; *y > 0; *y += direction) {
+ if (!(term.line[*y-1][term.col-1].mode
& ATTR_WRAP)) {
break;
}
}
- } else if(direction > 0 && *y < term.row-1) {
- for(; *y < term.row; *y += direction) {
- if(!(term.line[*y][term.col-1].mode
+ } else if (direction > 0) {
+ for (; *y < term.row-1; *y += direction) {
+ if (!(term.line[*y][term.col-1].mode
& ATTR_WRAP)) {
break;
}
@@ -793,161 +599,27 @@ selsnap(int mode, int *x, int *y, int direction) {
}
}
-void
-getbuttoninfo(XEvent *e) {
- int type;
- uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
-
- sel.alt = IS_SET(MODE_ALTSCREEN);
-
- sel.oe.x = x2col(e->xbutton.x);
- sel.oe.y = y2row(e->xbutton.y);
- selnormalize();
-
- sel.type = SEL_REGULAR;
- for(type = 1; type < LEN(selmasks); ++type) {
- if(match(selmasks[type], state)) {
- sel.type = type;
- break;
- }
- }
-}
-
-void
-mousereport(XEvent *e) {
- int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
- button = e->xbutton.button, state = e->xbutton.state,
- len;
- char buf[40];
- static int ox, oy;
-
- /* from urxvt */
- if(e->xbutton.type == MotionNotify) {
- if(x == ox && y == oy)
- return;
- if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
- return;
- /* MOUSE_MOTION: no reporting if no button is pressed */
- if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
- return;
-
- button = oldbutton + 32;
- ox = x;
- oy = y;
- } else {
- if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
- button = 3;
- } else {
- button -= Button1;
- if(button >= 3)
- button += 64 - 3;
- }
- if(e->xbutton.type == ButtonPress) {
- oldbutton = button;
- ox = x;
- oy = y;
- } else if(e->xbutton.type == ButtonRelease) {
- oldbutton = 3;
- /* MODE_MOUSEX10: no button release reporting */
- if(IS_SET(MODE_MOUSEX10))
- return;
- if (button == 64 || button == 65)
- return;
- }
- }
-
- if(!IS_SET(MODE_MOUSEX10)) {
- button += (state & ShiftMask ? 4 : 0)
- + (state & Mod4Mask ? 8 : 0)
- + (state & ControlMask ? 16 : 0);
- }
-
- len = 0;
- if(IS_SET(MODE_MOUSESGR)) {
- len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
- button, x+1, y+1,
- e->xbutton.type == ButtonRelease ? 'm' : 'M');
- } else if(x < 223 && y < 223) {
- len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
- 32+button, 32+x+1, 32+y+1);
- } else {
- return;
- }
-
- ttywrite(buf, len);
-}
-
-void
-bpress(XEvent *e) {
- struct timespec now;
- Mousekey *mk;
-
- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
- mousereport(e);
- return;
- }
-
- for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
- if(e->xbutton.button == mk->b
- && match(mk->mask, e->xbutton.state)) {
- ttysend(mk->s, strlen(mk->s));
- return;
- }
- }
-
- if(e->xbutton.button == Button1) {
- clock_gettime(CLOCK_MONOTONIC, &now);
-
- /* Clear previous selection, logically and visually. */
- selclear(NULL);
- sel.mode = 1;
- sel.type = SEL_REGULAR;
- sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
- sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
-
- /*
- * If the user clicks below predefined timeouts specific
- * snapping behaviour is exposed.
- */
- if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
- sel.snap = SNAP_LINE;
- } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
- sel.snap = SNAP_WORD;
- } else {
- sel.snap = 0;
- }
- selnormalize();
-
- /*
- * Draw selection, unless it's regular and we don't want to
- * make clicks visible
- */
- if(sel.snap != 0) {
- sel.mode++;
- tsetdirt(sel.nb.y, sel.ne.y);
- }
- sel.tclick2 = sel.tclick1;
- sel.tclick1 = now;
- }
-}
-
char *
-getsel(void) {
+getsel(void)
+{
char *str, *ptr;
- int y, bufsize, size, lastx, linelen;
+ int y, bufsize, lastx, linelen;
Glyph *gp, *last;
- if(sel.ob.x == -1)
+ if (sel.ob.x == -1)
return NULL;
bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
ptr = str = xmalloc(bufsize);
/* append every set & selected glyph to the selection */
- for(y = sel.nb.y; y <= sel.ne.y; y++) {
- linelen = tlinelen(y);
+ for (y = sel.nb.y; y <= sel.ne.y; y++) {
+ if ((linelen = tlinelen(y)) == 0) {
+ *ptr++ = '\n';
+ continue;
+ }
- if(sel.type == SEL_RECTANGULAR) {
+ if (sel.type == SEL_RECTANGULAR) {
gp = &term.line[y][sel.nb.x];
lastx = sel.ne.x;
} else {
@@ -955,16 +627,14 @@ getsel(void) {
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
}
last = &term.line[y][MIN(lastx, linelen-1)];
- while(last >= gp && last->c[0] == ' ')
+ while (last >= gp && last->u == ' ')
--last;
- for( ; gp <= last; ++gp) {
- if(gp->mode & ATTR_WDUMMY)
+ for ( ; gp <= last; ++gp) {
+ if (gp->mode & ATTR_WDUMMY)
continue;
- size = utf8len(gp->c);
- memcpy(ptr, gp->c, size);
- ptr += size;
+ ptr += utf8encode(gp->u, ptr);
}
/*
@@ -976,7 +646,7 @@ getsel(void) {
* st.
* FIXME: Fix the computer world.
*/
- if((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
+ if ((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
*ptr++ = '\n';
}
*ptr = 0;
@@ -984,235 +654,50 @@ getsel(void) {
}
void
-selcopy(void) {
- xsetsel(getsel());
+selclear(void)
+{
+ if (sel.ob.x == -1)
+ return;
+ sel.mode = SEL_IDLE;
+ sel.ob.x = -1;
+ tsetdirt(sel.nb.y, sel.ne.y);
}
void
-selnotify(XEvent *e) {
- ulong nitems, ofs, rem;
- int format;
- uchar *data, *last, *repl;
- Atom type;
- XSelectionEvent *xsev;
-
- ofs = 0;
- xsev = (XSelectionEvent *)e;
- if (xsev->property == None)
- return;
- do {
- if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
- BUFSIZ/4, False, AnyPropertyType,
- &type, &format, &nitems, &rem,
- &data)) {
- fprintf(stderr, "Clipboard allocation failed\n");
- return;
- }
-
- /*
- * 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))
- ttywrite("\033[200~", 6);
- ttysend((char *)data, nitems * format / 8);
- if(IS_SET(MODE_BRCKTPASTE))
- ttywrite("\033[201~", 6);
- XFree(data);
- /* number of 32-bit chunks returned */
- ofs += nitems * format / 32;
- } while(rem > 0);
-}
+die(const char *errstr, ...)
+{
+ va_list ap;
-void
-selpaste(const Arg *dummy) {
- XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
- xw.win, CurrentTime);
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
+ exit(1);
}
void
-clipcopy(const Arg *dummy) {
- Atom clipboard;
-
- if(sel.clipboard != NULL)
- free(sel.clipboard);
-
- if(sel.primary != NULL) {
- sel.clipboard = xstrdup(sel.primary);
- clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
- XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
- }
-}
-
-void
-clippaste(const Arg *dummy) {
- Atom clipboard;
-
- clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
- XConvertSelection(xw.dpy, clipboard, sel.xtarget, clipboard,
- xw.win, CurrentTime);
-}
-
-void
-selclear(XEvent *e) {
- if(sel.ob.x == -1)
- return;
- sel.ob.x = -1;
- tsetdirt(sel.nb.y, sel.ne.y);
-}
-
-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;
- /* reject */
- xev.property = None;
-
- xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
- if(xsre->target == xa_targets) {
- /* respond with the supported type */
- string = sel.xtarget;
- XChangeProperty(xsre->display, xsre->requestor, xsre->property,
- XA_ATOM, 32, PropModeReplace,
- (uchar *) &string, 1);
- xev.property = xsre->property;
- } else if(xsre->target == sel.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 = sel.primary;
- } else if(xsre->selection == clipboard) {
- seltext = sel.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, True, 0, (XEvent *) &xev))
- fprintf(stderr, "Error sending SelectionNotify event\n");
-}
-
-void
-xsetsel(char *str) {
- free(sel.primary);
- sel.primary = str;
-
- XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
-}
-
-void
-brelease(XEvent *e) {
- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
- mousereport(e);
- return;
- }
-
- if(e->xbutton.button == Button2) {
- selpaste(NULL);
- } else if(e->xbutton.button == Button1) {
- if(sel.mode < 2) {
- selclear(NULL);
- } else {
- getbuttoninfo(e);
- selcopy();
- }
- sel.mode = 0;
- tsetdirt(sel.nb.y, sel.ne.y);
- }
-}
-
-void
-bmotion(XEvent *e) {
- int oldey, oldex, oldsby, oldsey;
-
- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
- mousereport(e);
- return;
- }
-
- if(!sel.mode)
- return;
-
- sel.mode++;
- oldey = sel.oe.y;
- oldex = sel.oe.x;
- oldsby = sel.nb.y;
- oldsey = sel.ne.y;
- getbuttoninfo(e);
-
- if(oldey != sel.oe.y || oldex != sel.oe.x)
- tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
-}
-
-void
-die(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
-
-void
-execsh(void) {
- char **args, *sh, *prog;
- const struct passwd *pw;
- char buf[sizeof(long) * 8 + 1];
+execsh(char *cmd, char **args)
+{
+ char *sh, *prog;
+ const struct passwd *pw;
errno = 0;
- if((pw = getpwuid(getuid())) == NULL) {
- if(errno)
- die("getpwuid:%s\n", strerror(errno));
+ if ((pw = getpwuid(getuid())) == NULL) {
+ if (errno)
+ die("getpwuid: %s\n", strerror(errno));
else
die("who are you?\n");
}
- if (!(sh = getenv("SHELL"))) {
- sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
- }
+ if ((sh = getenv("SHELL")) == NULL)
+ sh = (pw->pw_shell[0]) ? pw->pw_shell : cmd;
- if(opt_cmd)
- prog = opt_cmd[0];
- else if(utmp)
+ if (args)
+ prog = args[0];
+ else if (utmp)
prog = utmp;
else
prog = sh;
- args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
-
- snprintf(buf, sizeof(buf), "%lu", xw.win);
+ DEFAULT(args, ((char *[]) {prog, NULL}));
unsetenv("COLUMNS");
unsetenv("LINES");
@@ -1222,7 +707,6 @@ execsh(void) {
setenv("SHELL", sh, 1);
setenv("HOME", pw->pw_dir, 1);
setenv("TERM", termname, 1);
- setenv("WINDOWID", buf, 1);
signal(SIGCHLD, SIG_DFL);
signal(SIGHUP, SIG_DFL);
@@ -1232,124 +716,248 @@ execsh(void) {
signal(SIGALRM, SIG_DFL);
execvp(prog, args);
- _exit(EXIT_FAILURE);
+ _exit(1);
}
void
-sigchld(int a) {
- int stat, ret;
+sigchld(int a)
+{
+ int stat;
+ pid_t p;
- if(waitpid(pid, &stat, 0) < 0)
- die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
+ if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
+ die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
+
+ if (pid != p)
+ return;
- ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
- if (ret != EXIT_SUCCESS)
- die("child finished with error '%d'\n", stat);
- exit(EXIT_SUCCESS);
+ if (WIFEXITED(stat) && WEXITSTATUS(stat))
+ die("child exited with status %d\n", WEXITSTATUS(stat));
+ else if (WIFSIGNALED(stat))
+ die("child terminated due to signal %d\n", WTERMSIG(stat));
+ exit(0);
}
void
-ttynew(void) {
+stty(char **args)
+{
+ char cmd[_POSIX_ARG_MAX], **p, *q, *s;
+ size_t n, siz;
+
+ if ((n = strlen(stty_args)) > sizeof(cmd)-1)
+ die("incorrect stty parameters\n");
+ memcpy(cmd, stty_args, n);
+ q = cmd + n;
+ siz = sizeof(cmd) - n;
+ for (p = args; p && (s = *p); ++p) {
+ if ((n = strlen(s)) > siz-1)
+ die("stty parameter length too long\n");
+ *q++ = ' ';
+ memcpy(q, s, n);
+ q += n;
+ siz -= n + 1;
+ }
+ *q = '\0';
+ if (system(cmd) != 0)
+ perror("Couldn't call stty");
+}
+
+int
+ttynew(char *line, char *cmd, char *out, char **args)
+{
int m, s;
- struct winsize w = {term.row, term.col, 0, 0};
+
+ if (out) {
+ term.mode |= MODE_PRINT;
+ iofd = (!strcmp(out, "-")) ?
+ 1 : open(out, O_WRONLY | O_CREAT, 0666);
+ if (iofd < 0) {
+ fprintf(stderr, "Error opening %s:%s\n",
+ out, strerror(errno));
+ }
+ }
+
+ if (line) {
+ if ((cmdfd = open(line, O_RDWR)) < 0)
+ die("open line '%s' failed: %s\n",
+ line, strerror(errno));
+ dup2(cmdfd, 0);
+ stty(args);
+ return cmdfd;
+ }
/* seems to work fine on linux, openbsd and freebsd */
- if(openpty(&m, &s, NULL, NULL, &w) < 0)
+ if (openpty(&m, &s, NULL, NULL, NULL) < 0)
die("openpty failed: %s\n", strerror(errno));
- switch(pid = fork()) {
+ switch (pid = fork()) {
case -1:
- die("fork failed\n");
+ die("fork failed: %s\n", strerror(errno));
break;
case 0:
+ close(iofd);
setsid(); /* create a new process group */
- dup2(s, STDIN_FILENO);
- dup2(s, STDOUT_FILENO);
- dup2(s, STDERR_FILENO);
- if(ioctl(s, TIOCSCTTY, NULL) < 0)
+ dup2(s, 0);
+ dup2(s, 1);
+ dup2(s, 2);
+ if (ioctl(s, TIOCSCTTY, NULL) < 0)
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
close(s);
close(m);
- execsh();
+#ifdef __OpenBSD__
+ if (pledge("stdio getpw proc exec", NULL) == -1)
+ die("pledge\n");
+#endif
+ execsh(cmd, args);
break;
default:
+#ifdef __OpenBSD__
+ if (pledge("stdio rpath tty proc", NULL) == -1)
+ die("pledge\n");
+#endif
close(s);
cmdfd = m;
signal(SIGCHLD, sigchld);
- if(opt_io) {
- term.mode |= MODE_PRINT;
- iofd = (!strcmp(opt_io, "-")) ?
- STDOUT_FILENO :
- open(opt_io, O_WRONLY | O_CREAT, 0666);
- if(iofd < 0) {
- fprintf(stderr, "Error opening %s:%s\n",
- opt_io, strerror(errno));
- }
- }
break;
}
+ return cmdfd;
}
-void
-ttyread(void) {
+size_t
+ttyread(void)
+{
static char buf[BUFSIZ];
static int buflen = 0;
- char *ptr;
- char s[UTF_SIZ];
- int charsize; /* size of utf8 char in bytes */
- long unicodep;
+ int written;
int ret;
/* append read bytes to unprocessed bytes */
- if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
- die("Couldn't read from shell: %s\n", strerror(errno));
-
- /* process every complete utf8 char */
+ if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
+ die("couldn't read from shell: %s\n", strerror(errno));
buflen += ret;
- ptr = buf;
- while((charsize = utf8decode(ptr, &unicodep, buflen))) {
- utf8encode(unicodep, s, UTF_SIZ);
- tputc(s, charsize);
- ptr += charsize;
- buflen -= charsize;
- }
+ written = twrite(buf, buflen, 0);
+ buflen -= written;
/* keep any uncomplete utf8 char for the next call */
- memmove(buf, ptr, buflen);
+ if (buflen > 0)
+ memmove(buf, buf + written, buflen);
+
+ return ret;
}
void
-ttywrite(const char *s, size_t n) {
- if(xwrite(cmdfd, s, n) == -1)
- die("write error on tty: %s\n", strerror(errno));
+ttywrite(const char *s, size_t n, int may_echo)
+{
+ const char *next;
+
+ if (may_echo && IS_SET(MODE_ECHO))
+ twrite(s, n, 1);
+
+ if (!IS_SET(MODE_CRLF)) {
+ ttywriteraw(s, n);
+ return;
+ }
+
+ /* This is similar to how the kernel handles ONLCR for ttys */
+ while (n > 0) {
+ if (*s == '\r') {
+ next = s + 1;
+ ttywriteraw("\r\n", 2);
+ } else {
+ next = memchr(s, '\r', n);
+ DEFAULT(next, s + n);
+ ttywriteraw(s, next - s);
+ }
+ n -= next - s;
+ s = next;
+ }
}
void
-ttysend(char *s, size_t n) {
- ttywrite(s, n);
- if(IS_SET(MODE_ECHO))
- techo(s, n);
+ttywriteraw(const char *s, size_t n)
+{
+ fd_set wfd, rfd;
+ ssize_t r;
+ size_t lim = 256;
+
+ /*
+ * Remember that we are using a pty, which might be a modem line.
+ * Writing too much will clog the line. That's why we are doing this
+ * dance.
+ * FIXME: Migrate the world to Plan 9.
+ */
+ while (n > 0) {
+ FD_ZERO(&wfd);
+ FD_ZERO(&rfd);
+ FD_SET(cmdfd, &wfd);
+ FD_SET(cmdfd, &rfd);
+
+ /* Check if we can write. */
+ if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) {
+ if (errno == EINTR)
+ continue;
+ die("select failed: %s\n", strerror(errno));
+ }
+ if (FD_ISSET(cmdfd, &wfd)) {
+ /*
+ * Only write the bytes written by ttywrite() or the
+ * default of 256. This seems to be a reasonable value
+ * for a serial line. Bigger values might clog the I/O.
+ */
+ if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0)
+ goto write_error;
+ if (r < n) {
+ /*
+ * We weren't able to write out everything.
+ * This means the buffer is getting full
+ * again. Empty it.
+ */
+ if (n < lim)
+ lim = ttyread();
+ n -= r;
+ s += r;
+ } else {
+ /* All bytes have been written. */
+ break;
+ }
+ }
+ if (FD_ISSET(cmdfd, &rfd))
+ lim = ttyread();
+ }
+ return;
+
+write_error:
+ die("write error on tty: %s\n", strerror(errno));
}
void
-ttyresize(void) {
+ttyresize(int tw, int th)
+{
struct winsize w;
w.ws_row = term.row;
w.ws_col = term.col;
- w.ws_xpixel = xw.tw;
- w.ws_ypixel = xw.th;
- if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
+ w.ws_xpixel = tw;
+ w.ws_ypixel = th;
+ if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
}
+void
+ttyhangup()
+{
+ /* Send SIGHUP to shell */
+ kill(pid, SIGHUP);
+}
+
int
-tattrset(int attr) {
+tattrset(int attr)
+{
int i, j;
- for(i = 0; i < term.row-1; i++) {
- for(j = 0; j < term.col-1; j++) {
- if(term.line[i][j].mode & attr)
+ for (i = 0; i < term.row-1; i++) {
+ for (j = 0; j < term.col-1; j++) {
+ if (term.line[i][j].mode & attr)
return 1;
}
}
@@ -1358,23 +966,25 @@ tattrset(int attr) {
}
void
-tsetdirt(int top, int bot) {
+tsetdirt(int top, int bot)
+{
int i;
LIMIT(top, 0, term.row-1);
LIMIT(bot, 0, term.row-1);
- for(i = top; i <= bot; i++)
+ for (i = top; i <= bot; i++)
term.dirty[i] = 1;
}
void
-tsetdirtattr(int attr) {
+tsetdirtattr(int attr)
+{
int i, j;
- for(i = 0; i < term.row-1; i++) {
- for(j = 0; j < term.col-1; j++) {
- if(term.line[i][j].mode & attr) {
+ for (i = 0; i < term.row-1; i++) {
+ for (j = 0; j < term.col-1; j++) {
+ if (term.line[i][j].mode & attr) {
tsetdirt(i, i);
break;
}
@@ -1383,25 +993,28 @@ tsetdirtattr(int attr) {
}
void
-tfulldirt(void) {
+tfulldirt(void)
+{
tsetdirt(0, term.row-1);
}
void
-tcursor(int mode) {
+tcursor(int mode)
+{
static TCursor c[2];
- bool alt = IS_SET(MODE_ALTSCREEN);
+ int alt = IS_SET(MODE_ALTSCREEN);
- if(mode == CURSOR_SAVE) {
+ if (mode == CURSOR_SAVE) {
c[alt] = term.c;
- } else if(mode == CURSOR_LOAD) {
+ } else if (mode == CURSOR_LOAD) {
term.c = c[alt];
tmoveto(c[alt].x, c[alt].y);
}
}
void
-treset(void) {
+treset(void)
+{
uint i;
term.c = (TCursor){{
@@ -1411,15 +1024,15 @@ treset(void) {
}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
- for(i = tabspaces; i < term.col; i += tabspaces)
+ for (i = tabspaces; i < term.col; i += tabspaces)
term.tabs[i] = 1;
term.top = 0;
term.bot = term.row - 1;
- term.mode = MODE_WRAP;
- memset(term.trantbl, sizeof(term.trantbl), CS_USA);
+ term.mode = MODE_WRAP|MODE_UTF8;
+ memset(term.trantbl, CS_USA, sizeof(term.trantbl));
term.charset = 0;
- for(i = 0; i < 2; i++) {
+ for (i = 0; i < 2; i++) {
tmoveto(0, 0);
tcursor(CURSOR_SAVE);
tclearregion(0, 0, term.col-1, term.row-1);
@@ -1428,16 +1041,16 @@ treset(void) {
}
void
-tnew(int col, int row) {
+tnew(int col, int row)
+{
term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
tresize(col, row);
- term.numlock = 1;
-
treset();
}
void
-tswapscreen(void) {
+tswapscreen(void)
+{
Line *tmp = term.line;
term.line = term.alt;
@@ -1447,7 +1060,8 @@ tswapscreen(void) {
}
void
-tscrolldown(int orig, int n) {
+tscrolldown(int orig, int n)
+{
int i;
Line temp;
@@ -1456,7 +1070,7 @@ tscrolldown(int orig, int n) {
tsetdirt(orig, term.bot-n);
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
- for(i = term.bot; i >= orig+n; i--) {
+ for (i = term.bot; i >= orig+n; i--) {
temp = term.line[i];
term.line[i] = term.line[i-n];
term.line[i-n] = temp;
@@ -1466,7 +1080,8 @@ tscrolldown(int orig, int n) {
}
void
-tscrollup(int orig, int n) {
+tscrollup(int orig, int n)
+{
int i;
Line temp;
@@ -1475,7 +1090,7 @@ tscrollup(int orig, int n) {
tclearregion(0, orig, term.col-1, orig+n-1);
tsetdirt(orig+n, term.bot);
- for(i = orig; i <= term.bot-n; i++) {
+ for (i = orig; i <= term.bot-n; i++) {
temp = term.line[i];
term.line[i] = term.line[i+n];
term.line[i+n] = temp;
@@ -1485,26 +1100,27 @@ tscrollup(int orig, int n) {
}
void
-selscroll(int orig, int n) {
- if(sel.ob.x == -1)
+selscroll(int orig, int n)
+{
+ if (sel.ob.x == -1)
return;
- if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
- if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
- selclear(NULL);
+ if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
+ if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+ selclear();
return;
}
- if(sel.type == SEL_RECTANGULAR) {
- if(sel.ob.y < term.top)
+ if (sel.type == SEL_RECTANGULAR) {
+ if (sel.ob.y < term.top)
sel.ob.y = term.top;
- if(sel.oe.y > term.bot)
+ if (sel.oe.y > term.bot)
sel.oe.y = term.bot;
} else {
- if(sel.ob.y < term.top) {
+ if (sel.ob.y < term.top) {
sel.ob.y = term.top;
sel.ob.x = 0;
}
- if(sel.oe.y > term.bot) {
+ if (sel.oe.y > term.bot) {
sel.oe.y = term.bot;
sel.oe.x = term.col;
}
@@ -1514,10 +1130,11 @@ selscroll(int orig, int n) {
}
void
-tnewline(int first_col) {
+tnewline(int first_col)
+{
int y = term.c.y;
- if(y == term.bot) {
+ if (y == term.bot) {
tscrollup(term.top, 1);
} else {
y++;
@@ -1526,27 +1143,28 @@ tnewline(int first_col) {
}
void
-csiparse(void) {
+csiparse(void)
+{
char *p = csiescseq.buf, *np;
long int v;
csiescseq.narg = 0;
- if(*p == '?') {
+ if (*p == '?') {
csiescseq.priv = 1;
p++;
}
csiescseq.buf[csiescseq.len] = '\0';
- while(p < csiescseq.buf+csiescseq.len) {
+ while (p < csiescseq.buf+csiescseq.len) {
np = NULL;
v = strtol(p, &np, 10);
- if(np == p)
+ if (np == p)
v = 0;
- if(v == LONG_MAX || v == LONG_MIN)
+ if (v == LONG_MAX || v == LONG_MIN)
v = -1;
csiescseq.arg[csiescseq.narg++] = v;
p = np;
- if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+ if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
break;
p++;
}
@@ -1556,15 +1174,17 @@ csiparse(void) {
/* for absolute user moves, when decom is set */
void
-tmoveato(int x, int y) {
+tmoveato(int x, int y)
+{
tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
}
void
-tmoveto(int x, int y) {
+tmoveto(int x, int y)
+{
int miny, maxy;
- if(term.c.state & CURSOR_ORIGIN) {
+ if (term.c.state & CURSOR_ORIGIN) {
miny = term.top;
maxy = term.bot;
} else {
@@ -1577,7 +1197,8 @@ tmoveto(int x, int y) {
}
void
-tsetchar(char *c, Glyph *attr, int x, int y) {
+tsetchar(Rune u, Glyph *attr, int x, int y)
+{
static char *vt100_0[62] = { /* 0x41 - 0x7e */
"â", "â", "â", "â", "â", "â", "â", /* A - G */
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
@@ -1592,35 +1213,34 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
/*
* The table is proudly stolen from rxvt.
*/
- if(term.trantbl[term.charset] == CS_GRAPHIC0) {
- if(BETWEEN(c[0], 0x41, 0x7e) && vt100_0[c[0] - 0x41]) {
- c = vt100_0[c[0] - 0x41];
- }
- }
+ if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
+ BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
+ utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
- if(term.line[y][x].mode & ATTR_WIDE) {
- if(x+1 < term.col) {
- term.line[y][x+1].c[0] = ' ';
+ if (term.line[y][x].mode & ATTR_WIDE) {
+ if (x+1 < term.col) {
+ term.line[y][x+1].u = ' ';
term.line[y][x+1].mode &= ~ATTR_WDUMMY;
}
- } else if(term.line[y][x].mode & ATTR_WDUMMY) {
- term.line[y][x-1].c[0] = ' ';
+ } else if (term.line[y][x].mode & ATTR_WDUMMY) {
+ term.line[y][x-1].u = ' ';
term.line[y][x-1].mode &= ~ATTR_WIDE;
}
term.dirty[y] = 1;
term.line[y][x] = *attr;
- memcpy(term.line[y][x].c, c, UTF_SIZ);
+ term.line[y][x].u = u;
}
void
-tclearregion(int x1, int y1, int x2, int y2) {
+tclearregion(int x1, int y1, int x2, int y2)
+{
int x, y, temp;
Glyph *gp;
- if(x1 > x2)
+ if (x1 > x2)
temp = x1, x1 = x2, x2 = temp;
- if(y1 > y2)
+ if (y1 > y2)
temp = y1, y1 = y2, y2 = temp;
LIMIT(x1, 0, term.col-1);
@@ -1628,22 +1248,23 @@ tclearregion(int x1, int y1, int x2, int y2) {
LIMIT(y1, 0, term.row-1);
LIMIT(y2, 0, term.row-1);
- for(y = y1; y <= y2; y++) {
+ for (y = y1; y <= y2; y++) {
term.dirty[y] = 1;
- for(x = x1; x <= x2; x++) {
+ for (x = x1; x <= x2; x++) {
gp = &term.line[y][x];
- if(selected(x, y))
- selclear(NULL);
+ if (selected(x, y))
+ selclear();
gp->fg = term.c.attr.fg;
gp->bg = term.c.attr.bg;
gp->mode = 0;
- memcpy(gp->c, " ", 2);
+ gp->u = ' ';
}
}
}
void
-tdeletechar(int n) {
+tdeletechar(int n)
+{
int dst, src, size;
Glyph *line;
@@ -1659,7 +1280,8 @@ tdeletechar(int n) {
}
void
-tinsertblank(int n) {
+tinsertblank(int n)
+{
int dst, src, size;
Glyph *line;
@@ -1675,19 +1297,22 @@ tinsertblank(int n) {
}
void
-tinsertblankline(int n) {
- if(BETWEEN(term.c.y, term.top, term.bot))
+tinsertblankline(int n)
+{
+ if (BETWEEN(term.c.y, term.top, term.bot))
tscrolldown(term.c.y, n);
}
void
-tdeleteline(int n) {
- if(BETWEEN(term.c.y, term.top, term.bot))
+tdeleteline(int n)
+{
+ if (BETWEEN(term.c.y, term.top, term.bot))
tscrollup(term.c.y, n);
}
int32_t
-tdefcolor(int *attr, int *npar, int l) {
+tdefcolor(int *attr, int *npar, int l)
+{
int32_t idx = -1;
uint r, g, b;
@@ -1703,8 +1328,8 @@ tdefcolor(int *attr, int *npar, int l) {
g = attr[*npar + 3];
b = attr[*npar + 4];
*npar += 4;
- if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
- fprintf(stderr, "erresc: bad rgb color (%d,%d,%d)\n",
+ if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
+ fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
r, g, b);
else
idx = TRUECOLOR(r, g, b);
@@ -1717,7 +1342,7 @@ tdefcolor(int *attr, int *npar, int l) {
break;
}
*npar += 2;
- if(!BETWEEN(attr[*npar], 0, 255))
+ if (!BETWEEN(attr[*npar], 0, 255))
fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
else
idx = attr[*npar];
@@ -1736,12 +1361,13 @@ tdefcolor(int *attr, int *npar, int l) {
}
void
-tsetattr(int *attr, int l) {
+tsetattr(int *attr, int l)
+{
int i;
int32_t idx;
- for(i = 0; i < l; i++) {
- switch(attr[i]) {
+ for (i = 0; i < l; i++) {
+ switch (attr[i]) {
case 0:
term.c.attr.mode &= ~(
ATTR_BOLD |
@@ -1817,18 +1443,19 @@ tsetattr(int *attr, int l) {
term.c.attr.bg = defaultbg;
break;
default:
- if(BETWEEN(attr[i], 30, 37)) {
+ if (BETWEEN(attr[i], 30, 37)) {
term.c.attr.fg = attr[i] - 30;
- } else if(BETWEEN(attr[i], 40, 47)) {
+ } else if (BETWEEN(attr[i], 40, 47)) {
term.c.attr.bg = attr[i] - 40;
- } else if(BETWEEN(attr[i], 90, 97)) {
+ } else if (BETWEEN(attr[i], 90, 97)) {
term.c.attr.fg = attr[i] - 90 + 8;
- } else if(BETWEEN(attr[i], 100, 107)) {
+ } else if (BETWEEN(attr[i], 100, 107)) {
term.c.attr.bg = attr[i] - 100 + 8;
} else {
fprintf(stderr,
"erresc(default): gfx attr %d unknown\n",
- attr[i]), csidump();
+ attr[i]);
+ csidump();
}
break;
}
@@ -1836,12 +1463,13 @@ tsetattr(int *attr, int l) {
}
void
-tsetscroll(int t, int b) {
+tsetscroll(int t, int b)
+{
int temp;
LIMIT(t, 0, term.row-1);
LIMIT(b, 0, term.row-1);
- if(t > b) {
+ if (t > b) {
temp = t;
t = b;
b = temp;
@@ -1851,21 +1479,18 @@ tsetscroll(int t, int b) {
}
void
-tsetmode(bool priv, bool set, int *args, int narg) {
- int *lim, mode;
- bool alt;
+tsetmode(int priv, int set, int *args, int narg)
+{
+ int alt, *lim;
- for(lim = args + narg; args < lim; ++args) {
- if(priv) {
- switch(*args) {
+ for (lim = args + narg; args < lim; ++args) {
+ if (priv) {
+ switch (*args) {
case 1: /* DECCKM -- Cursor key */
- MODBIT(term.mode, set, MODE_APPCURSOR);
+ xsetmode(set, MODE_APPCURSOR);
break;
case 5: /* DECSCNM -- Reverse video */
- mode = term.mode;
- MODBIT(term.mode, set, MODE_REVERSE);
- if(mode != term.mode)
- redraw();
+ xsetmode(set, MODE_REVERSE);
break;
case 6: /* DECOM -- Origin */
MODBIT(term.c.state, set, CURSOR_ORIGIN);
@@ -1885,36 +1510,36 @@ tsetmode(bool priv, bool set, int *args, int narg) {
case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
case 25: /* DECTCEM -- Text Cursor Enable Mode */
- MODBIT(term.mode, !set, MODE_HIDE);
+ xsetmode(!set, MODE_HIDE);
break;
case 9: /* X10 mouse compatibility mode */
xsetpointermotion(0);
- MODBIT(term.mode, 0, MODE_MOUSE);
- MODBIT(term.mode, set, MODE_MOUSEX10);
+ xsetmode(0, MODE_MOUSE);
+ xsetmode(set, MODE_MOUSEX10);
break;
case 1000: /* 1000: report button press */
xsetpointermotion(0);
- MODBIT(term.mode, 0, MODE_MOUSE);
- MODBIT(term.mode, set, MODE_MOUSEBTN);
+ xsetmode(0, MODE_MOUSE);
+ xsetmode(set, MODE_MOUSEBTN);
break;
case 1002: /* 1002: report motion on button press */
xsetpointermotion(0);
- MODBIT(term.mode, 0, MODE_MOUSE);
- MODBIT(term.mode, set, MODE_MOUSEMOTION);
+ xsetmode(0, MODE_MOUSE);
+ xsetmode(set, MODE_MOUSEMOTION);
break;
case 1003: /* 1003: enable all mouse motions */
xsetpointermotion(set);
- MODBIT(term.mode, 0, MODE_MOUSE);
- MODBIT(term.mode, set, MODE_MOUSEMANY);
+ xsetmode(0, MODE_MOUSE);
+ xsetmode(set, MODE_MOUSEMANY);
break;
case 1004: /* 1004: send focus events to tty */
- MODBIT(term.mode, set, MODE_FOCUS);
+ xsetmode(set, MODE_FOCUS);
break;
case 1006: /* 1006: extended reporting mode */
- MODBIT(term.mode, set, MODE_MOUSESGR);
+ xsetmode(set, MODE_MOUSESGR);
break;
case 1034:
- MODBIT(term.mode, set, MODE_8BIT);
+ xsetmode(set, MODE_8BIT);
break;
case 1049: /* swap screen & set/restore cursor as xterm */
if (!allowaltscreen)
@@ -1926,20 +1551,20 @@ tsetmode(bool priv, bool set, int *args, int narg) {
if (!allowaltscreen)
break;
alt = IS_SET(MODE_ALTSCREEN);
- if(alt) {
+ if (alt) {
tclearregion(0, 0, term.col-1,
term.row-1);
}
- if(set ^ alt) /* set is always 1 or 0 */
+ if (set ^ alt) /* set is always 1 or 0 */
tswapscreen();
- if(*args != 1049)
+ if (*args != 1049)
break;
/* FALLTHROUGH */
case 1048:
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
break;
case 2004: /* 2004: bracketed paste mode */
- MODBIT(term.mode, set, MODE_BRCKTPASTE);
+ xsetmode(set, MODE_BRCKTPASTE);
break;
/* Not implemented mouse modes. See comments there. */
case 1001: /* mouse highlight mode; can hang the
@@ -1957,11 +1582,11 @@ tsetmode(bool priv, bool set, int *args, int narg) {
break;
}
} else {
- switch(*args) {
+ switch (*args) {
case 0: /* Error (IGNORED) */
break;
- case 2: /* KAM -- keyboard action */
- MODBIT(term.mode, set, MODE_KBDLOCK);
+ case 2:
+ xsetmode(set, MODE_KBDLOCK);
break;
case 4: /* IRM -- Insertion-replacement */
MODBIT(term.mode, set, MODE_INSERT);
@@ -1983,11 +1608,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
}
void
-csihandle(void) {
+csihandle(void)
+{
char buf[40];
int len;
- switch(csiescseq.mode[0]) {
+ switch (csiescseq.mode[0]) {
default:
unknown:
fprintf(stderr, "erresc: unknown csi ");
@@ -2008,7 +1634,7 @@ csihandle(void) {
tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
break;
case 'i': /* MC -- Media Copy */
- switch(csiescseq.arg[0]) {
+ switch (csiescseq.arg[0]) {
case 0:
tdump();
break;
@@ -2027,8 +1653,8 @@ csihandle(void) {
}
break;
case 'c': /* DA -- Device Attributes */
- if(csiescseq.arg[0] == 0)
- ttywrite(vtiden, sizeof(vtiden) - 1);
+ if (csiescseq.arg[0] == 0)
+ ttywrite(vtiden, strlen(vtiden), 0);
break;
case 'C': /* CUF -- Cursor <n> Forward */
case 'a': /* HPR -- Cursor <n> Forward */
@@ -2048,7 +1674,7 @@ csihandle(void) {
tmoveto(0, term.c.y-csiescseq.arg[0]);
break;
case 'g': /* TBC -- Tabulation clear */
- switch(csiescseq.arg[0]) {
+ switch (csiescseq.arg[0]) {
case 0: /* clear current tab stop */
term.tabs[term.c.x] = 0;
break;
@@ -2075,17 +1701,16 @@ csihandle(void) {
tputtab(csiescseq.arg[0]);
break;
case 'J': /* ED -- Clear screen */
- selclear(NULL);
- switch(csiescseq.arg[0]) {
+ switch (csiescseq.arg[0]) {
case 0: /* below */
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
- if(term.c.y < term.row-1) {
+ if (term.c.y < term.row-1) {
tclearregion(0, term.c.y+1, term.col-1,
term.row-1);
}
break;
case 1: /* above */
- if(term.c.y > 1)
+ if (term.c.y > 1)
tclearregion(0, 0, term.col-1, term.c.y-1);
tclearregion(0, term.c.y, term.c.x, term.c.y);
break;
@@ -2097,7 +1722,7 @@ csihandle(void) {
}
break;
case 'K': /* EL -- Clear line */
- switch(csiescseq.arg[0]) {
+ switch (csiescseq.arg[0]) {
case 0: /* right */
tclearregion(term.c.x, term.c.y, term.col-1,
term.c.y);
@@ -2156,11 +1781,11 @@ csihandle(void) {
if (csiescseq.arg[0] == 6) {
len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
term.c.y+1, term.c.x+1);
- ttywrite(buf, len);
+ ttywrite(buf, len, 0);
}
break;
case 'r': /* DECSTBM -- Set Scrolling Region */
- if(csiescseq.priv) {
+ if (csiescseq.priv) {
goto unknown;
} else {
DEFAULT(csiescseq.arg[0], 1);
@@ -2177,75 +1802,87 @@ csihandle(void) {
break;
case ' ':
switch (csiescseq.mode[1]) {
- case 'q': /* DECSCUSR -- Set Cursor Style */
- DEFAULT(csiescseq.arg[0], 1);
- if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
- goto unknown;
- }
- xw.cursor = csiescseq.arg[0];
- break;
- default:
+ case 'q': /* DECSCUSR -- Set Cursor Style */
+ if (xsetcursor(csiescseq.arg[0]))
goto unknown;
+ break;
+ default:
+ goto unknown;
}
break;
}
}
void
-csidump(void) {
+csidump(void)
+{
int i;
uint c;
- printf("ESC[");
- for(i = 0; i < csiescseq.len; i++) {
+ fprintf(stderr, "ESC[");
+ for (i = 0; i < csiescseq.len; i++) {
c = csiescseq.buf[i] & 0xff;
- if(isprint(c)) {
- putchar(c);
- } else if(c == '\n') {
- printf("(\\n)");
- } else if(c == '\r') {
- printf("(\\r)");
- } else if(c == 0x1b) {
- printf("(\\e)");
+ if (isprint(c)) {
+ putc(c, stderr);
+ } else if (c == '\n') {
+ fprintf(stderr, "(\\n)");
+ } else if (c == '\r') {
+ fprintf(stderr, "(\\r)");
+ } else if (c == 0x1b) {
+ fprintf(stderr, "(\\e)");
} else {
- printf("(%02x)", c);
+ fprintf(stderr, "(%02x)", c);
}
}
- putchar('\n');
+ putc('\n', stderr);
}
void
-csireset(void) {
+csireset(void)
+{
memset(&csiescseq, 0, sizeof(csiescseq));
}
void
-strhandle(void) {
+strhandle(void)
+{
char *p = NULL;
int j, narg, par;
term.esc &= ~(ESC_STR_END|ESC_STR);
strparse();
- narg = strescseq.narg;
- par = atoi(strescseq.args[0]);
+ par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
- switch(strescseq.type) {
+ switch (strescseq.type) {
case ']': /* OSC -- Operating System Command */
- switch(par) {
+ switch (par) {
case 0:
case 1:
case 2:
- if(narg > 1)
+ if (narg > 1)
xsettitle(strescseq.args[1]);
return;
+ case 52:
+ if (narg > 2) {
+ char *dec;
+
+ dec = base64dec(strescseq.args[2]);
+ if (dec) {
+ xsetsel(dec);
+ xclipcopy();
+ } else {
+ fprintf(stderr, "erresc: invalid base64\n");
+ }
+ }
+ return;
case 4: /* color set */
- if(narg < 3)
+ if (narg < 3)
break;
p = strescseq.args[2];
/* FALLTHROUGH */
case 104: /* color reset, here p = NULL */
j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
- if(xsetcolorname(j, p)) {
+ if (xsetcolorname(j, p)) {
fprintf(stderr, "erresc: invalid color %s\n", p);
} else {
/*
@@ -2261,6 +1898,7 @@ strhandle(void) {
xsettitle(strescseq.args[0]);
return;
case 'P': /* DCS -- Device Control String */
+ term.mode |= ESC_DCS;
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
return;
@@ -2271,158 +1909,164 @@ strhandle(void) {
}
void
-strparse(void) {
+strparse(void)
+{
int c;
char *p = strescseq.buf;
strescseq.narg = 0;
strescseq.buf[strescseq.len] = '\0';
- if(*p == '\0')
+ if (*p == '\0')
return;
- while(strescseq.narg < STR_ARG_SIZ) {
+ while (strescseq.narg < STR_ARG_SIZ) {
strescseq.args[strescseq.narg++] = p;
- while((c = *p) != ';' && c != '\0')
+ while ((c = *p) != ';' && c != '\0')
++p;
- if(c == '\0')
+ if (c == '\0')
return;
*p++ = '\0';
}
}
void
-strdump(void) {
+strdump(void)
+{
int i;
uint c;
- printf("ESC%c", strescseq.type);
- for(i = 0; i < strescseq.len; i++) {
+ fprintf(stderr, "ESC%c", strescseq.type);
+ for (i = 0; i < strescseq.len; i++) {
c = strescseq.buf[i] & 0xff;
- if(c == '\0') {
+ if (c == '\0') {
+ putc('\n', stderr);
return;
- } else if(isprint(c)) {
- putchar(c);
- } else if(c == '\n') {
- printf("(\\n)");
- } else if(c == '\r') {
- printf("(\\r)");
- } else if(c == 0x1b) {
- printf("(\\e)");
+ } else if (isprint(c)) {
+ putc(c, stderr);
+ } else if (c == '\n') {
+ fprintf(stderr, "(\\n)");
+ } else if (c == '\r') {
+ fprintf(stderr, "(\\r)");
+ } else if (c == 0x1b) {
+ fprintf(stderr, "(\\e)");
} else {
- printf("(%02x)", c);
+ fprintf(stderr, "(%02x)", c);
}
}
- printf("ESC\\\n");
+ fprintf(stderr, "ESC\\\n");
}
void
-strreset(void) {
+strreset(void)
+{
memset(&strescseq, 0, sizeof(strescseq));
}
void
-tprinter(char *s, size_t len) {
- if(iofd != -1 && xwrite(iofd, s, len) < 0) {
- fprintf(stderr, "Error writing in %s:%s\n",
- opt_io, strerror(errno));
+sendbreak(const Arg *arg)
+{
+ if (tcsendbreak(cmdfd, 0))
+ perror("Error sending break");
+}
+
+void
+tprinter(char *s, size_t len)
+{
+ if (iofd != -1 && xwrite(iofd, s, len) < 0) {
+ perror("Error writing to output file");
close(iofd);
iofd = -1;
}
}
void
-toggleprinter(const Arg *arg) {
+toggleprinter(const Arg *arg)
+{
term.mode ^= MODE_PRINT;
}
void
-printscreen(const Arg *arg) {
+printscreen(const Arg *arg)
+{
tdump();
}
void
-printsel(const Arg *arg) {
+printsel(const Arg *arg)
+{
tdumpsel();
}
void
-tdumpsel(void) {
+tdumpsel(void)
+{
char *ptr;
- if((ptr = getsel())) {
+ if ((ptr = getsel())) {
tprinter(ptr, strlen(ptr));
free(ptr);
}
}
void
-tdumpline(int n) {
+tdumpline(int n)
+{
+ char buf[UTF_SIZ];
Glyph *bp, *end;
bp = &term.line[n][0];
end = &bp[MIN(tlinelen(n), term.col) - 1];
- if(bp != end || bp->c[0] != ' ') {
- for( ;bp <= end; ++bp)
- tprinter(bp->c, utf8len(bp->c));
+ if (bp != end || bp->u != ' ') {
+ for ( ;bp <= end; ++bp)
+ tprinter(buf, utf8encode(bp->u, buf));
}
tprinter("\n", 1);
}
void
-tdump(void) {
+tdump(void)
+{
int i;
- for(i = 0; i < term.row; ++i)
+ for (i = 0; i < term.row; ++i)
tdumpline(i);
}
void
-tputtab(int n) {
+tputtab(int n)
+{
uint x = term.c.x;
- if(n > 0) {
- while(x < term.col && n--)
- for(++x; x < term.col && !term.tabs[x]; ++x)
+ if (n > 0) {
+ while (x < term.col && n--)
+ for (++x; x < term.col && !term.tabs[x]; ++x)
/* nothing */ ;
- } else if(n < 0) {
- while(x > 0 && n++)
- for(--x; x > 0 && !term.tabs[x]; --x)
+ } else if (n < 0) {
+ while (x > 0 && n++)
+ for (--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
- tmoveto(x, term.c.y);
+ term.c.x = LIMIT(x, 0, term.col-1);
}
void
-techo(char *buf, int len) {
- for(; len > 0; buf++, len--) {
- char c = *buf;
-
- if(ISCONTROL((uchar) c)) { /* control code */
- if(c & 0x80) {
- c &= 0x7f;
- tputc("^", 1);
- tputc("[", 1);
- } else if(c != '\n' && c != '\r' && c != '\t') {
- c ^= 0x40;
- tputc("^", 1);
- }
- tputc(&c, 1);
- } else {
- break;
- }
- }
- if(len)
- tputc(buf, len);
+tdefutf8(char ascii)
+{
+ if (ascii == 'G')
+ term.mode |= MODE_UTF8;
+ else if (ascii == '@')
+ term.mode &= ~MODE_UTF8;
}
void
-tdeftran(char ascii) {
+tdeftran(char ascii)
+{
static char cs[] = "0B";
static int vcs[] = {CS_GRAPHIC0, CS_USA};
char *p;
- if((p = strchr(cs, ascii)) == NULL) {
+ if ((p = strchr(cs, ascii)) == NULL) {
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
} else {
term.trantbl[term.icharset] = vcs[p - cs];
@@ -2430,47 +2074,46 @@ tdeftran(char ascii) {
}
void
-tdectest(char c) {
- static char E[UTF_SIZ] = "E";
+tdectest(char c)
+{
int x, y;
- if(c == '8') { /* DEC screen alignment test. */
- for(x = 0; x < term.col; ++x) {
- for(y = 0; y < term.row; ++y)
- tsetchar(E, &term.c.attr, x, y);
+ if (c == '8') { /* DEC screen alignment test. */
+ for (x = 0; x < term.col; ++x) {
+ for (y = 0; y < term.row; ++y)
+ tsetchar('E', &term.c.attr, x, y);
}
}
}
void
-tstrsequence(uchar c) {
- if (c & 0x80) {
- switch (c) {
- case 0x90: /* DCS -- Device Control String */
- c = 'P';
- break;
- case 0x9f: /* APC -- Application Program Command */
- c = '_';
- break;
- case 0x9e: /* PM -- Privacy Message */
- c = '^';
- break;
- case 0x9d: /* OSC -- Operating System Command */
- c = ']';
- break;
- }
- }
+tstrsequence(uchar c)
+{
strreset();
+
+ switch (c) {
+ case 0x90: /* DCS -- Device Control String */
+ c = 'P';
+ term.esc |= ESC_DCS;
+ break;
+ case 0x9f: /* APC -- Application Program Command */
+ c = '_';
+ break;
+ case 0x9e: /* PM -- Privacy Message */
+ c = '^';
+ break;
+ case 0x9d: /* OSC -- Operating System Command */
+ c = ']';
+ break;
+ }
strescseq.type = c;
term.esc |= ESC_STR;
- return;
}
void
-tcontrolcode(uchar ascii) {
- static char question[UTF_SIZ] = "?";
-
- switch(ascii) {
+tcontrolcode(uchar ascii)
+{
+ switch (ascii) {
case '\t': /* HT */
tputtab(1);
return;
@@ -2487,14 +2130,11 @@ tcontrolcode(uchar ascii) {
tnewline(IS_SET(MODE_CRLF));
return;
case '\a': /* BEL */
- if(term.esc & ESC_STR_END) {
+ if (term.esc & ESC_STR_END) {
/* backwards compatibility to xterm */
strhandle();
} else {
- if(!(xw.state & WIN_FOCUSED))
- xseturgency(1);
- if (bellvolume)
- XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
+ xbell();
}
break;
case '\033': /* ESC */
@@ -2507,7 +2147,7 @@ tcontrolcode(uchar ascii) {
term.charset = 1 - (ascii - '\016');
return;
case '\032': /* SUB */
- tsetchar(question, &term.c.attr, term.c.x, term.c.y);
+ tsetchar('?', &term.c.attr, term.c.x, term.c.y);
case '\030': /* CAN */
csireset();
break;
@@ -2517,35 +2157,53 @@ tcontrolcode(uchar ascii) {
case '\023': /* XOFF (IGNORED) */
case 0177: /* DEL (IGNORED) */
return;
+ case 0x80: /* TODO: PAD */
+ case 0x81: /* TODO: HOP */
+ case 0x82: /* TODO: BPH */
+ case 0x83: /* TODO: NBH */
case 0x84: /* TODO: IND */
break;
case 0x85: /* NEL -- Next line */
tnewline(1); /* always go to first col */
break;
+ case 0x86: /* TODO: SSA */
+ case 0x87: /* TODO: ESA */
+ break;
case 0x88: /* HTS -- Horizontal tab stop */
term.tabs[term.c.x] = 1;
break;
+ case 0x89: /* TODO: HTJ */
+ case 0x8a: /* TODO: VTS */
+ case 0x8b: /* TODO: PLD */
+ case 0x8c: /* TODO: PLU */
case 0x8d: /* TODO: RI */
case 0x8e: /* TODO: SS2 */
case 0x8f: /* TODO: SS3 */
+ case 0x91: /* TODO: PU1 */
+ case 0x92: /* TODO: PU2 */
+ case 0x93: /* TODO: STS */
+ case 0x94: /* TODO: CCH */
+ case 0x95: /* TODO: MW */
+ case 0x96: /* TODO: SPA */
+ case 0x97: /* TODO: EPA */
case 0x98: /* TODO: SOS */
+ case 0x99: /* TODO: SGCI */
break;
case 0x9a: /* DECID -- Identify Terminal */
- ttywrite(vtiden, sizeof(vtiden) - 1);
+ ttywrite(vtiden, strlen(vtiden), 0);
break;
case 0x9b: /* TODO: CSI */
case 0x9c: /* TODO: ST */
break;
case 0x90: /* DCS -- Device Control String */
- case 0x9f: /* APC -- Application Program Command */
- case 0x9e: /* PM -- Privacy Message */
case 0x9d: /* OSC -- Operating System Command */
+ case 0x9e: /* PM -- Privacy Message */
+ case 0x9f: /* APC -- Application Program Command */
tstrsequence(ascii);
return;
}
/* only CAN, SUB, \a and C1 chars interrupt a sequence */
term.esc &= ~(ESC_STR_END|ESC_STR);
- return;
}
/*
@@ -2553,14 +2211,18 @@ tcontrolcode(uchar ascii) {
* more characters for this sequence, otherwise 0
*/
int
-eschandle(uchar ascii) {
- switch(ascii) {
+eschandle(uchar ascii)
+{
+ switch (ascii) {
case '[':
term.esc |= ESC_CSI;
return 0;
case '#':
term.esc |= ESC_TEST;
return 0;
+ case '%':
+ term.esc |= ESC_UTF8;
+ return 0;
case 'P': /* DCS -- Device Control String */
case '_': /* APC -- Application Program Command */
case '^': /* PM -- Privacy Message */
@@ -2580,7 +2242,7 @@ eschandle(uchar ascii) {
term.esc |= ESC_ALTCHARSET;
return 0;
case 'D': /* IND -- Linefeed */
- if(term.c.y == term.bot) {
+ if (term.c.y == term.bot) {
tscrollup(term.top, 1);
} else {
tmoveto(term.c.x, term.c.y+1);
@@ -2593,25 +2255,25 @@ eschandle(uchar ascii) {
term.tabs[term.c.x] = 1;
break;
case 'M': /* RI -- Reverse index */
- if(term.c.y == term.top) {
+ if (term.c.y == term.top) {
tscrolldown(term.top, 1);
} else {
tmoveto(term.c.x, term.c.y-1);
}
break;
case 'Z': /* DECID -- Identify Terminal */
- ttywrite(vtiden, sizeof(vtiden) - 1);
+ ttywrite(vtiden, strlen(vtiden), 0);
break;
- case 'c': /* RIS -- Reset to inital state */
+ case 'c': /* RIS -- Reset to initial state */
treset();
- xresettitle();
+ resettitle();
xloadcols();
break;
case '=': /* DECPAM -- Application keypad */
- term.mode |= MODE_APPKEYPAD;
+ xsetmode(1, MODE_APPKEYPAD);
break;
case '>': /* DECPNM -- Normal keypad */
- term.mode &= ~MODE_APPKEYPAD;
+ xsetmode(0, MODE_APPKEYPAD);
break;
case '7': /* DECSC -- Save Cursor */
tcursor(CURSOR_SAVE);
@@ -2620,7 +2282,7 @@ eschandle(uchar ascii) {
tcursor(CURSOR_LOAD);
break;
case '\\': /* ST -- String Terminator */
- if(term.esc & ESC_STR_END)
+ if (term.esc & ESC_STR_END)
strhandle();
break;
default:
@@ -2632,28 +2294,27 @@ eschandle(uchar ascii) {
}
void
-tputc(char *c, int len) {
- uchar ascii;
- bool control;
- long unicodep;
- int width;
+tputc(Rune u)
+{
+ char c[UTF_SIZ];
+ int control;
+ int width, len;
Glyph *gp;
- if(len == 1) {
- width = 1;
- unicodep = ascii = *c;
+ control = ISCONTROL(u);
+ if (!IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
+ c[0] = u;
+ width = len = 1;
} else {
- utf8decode(c, &unicodep, UTF_SIZ);
- if ((width = wcwidth(unicodep)) == -1) {
- c = "\357\277\275"; /* UTF_INVALID */
+ len = utf8encode(u, c);
+ if (!control && (width = wcwidth(u)) == -1) {
+ memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
width = 1;
}
- ascii = unicodep;
}
- if(IS_SET(MODE_PRINT))
+ if (IS_SET(MODE_PRINT))
tprinter(c, len);
- control = ISCONTROL(unicodep);
/*
* STR sequence must be checked before anything else
@@ -2661,50 +2322,65 @@ tputc(char *c, int len) {
* receives a ESC, a SUB, a ST or any other C1 control
* character.
*/
- if(term.esc & ESC_STR) {
- if(len == 1 &&
- (ascii == '\a' || ascii == 030 ||
- ascii == 032 || ascii == 033 ||
- ISCONTROLC1(unicodep))) {
- term.esc &= ~(ESC_START|ESC_STR);
+ if (term.esc & ESC_STR) {
+ if (u == '\a' || u == 030 || u == 032 || u == 033 ||
+ ISCONTROLC1(u)) {
+ term.esc &= ~(ESC_START|ESC_STR|ESC_DCS);
+ if (IS_SET(MODE_SIXEL)) {
+ /* TODO: render sixel */;
+ term.mode &= ~MODE_SIXEL;
+ return;
+ }
term.esc |= ESC_STR_END;
- } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
- memmove(&strescseq.buf[strescseq.len], c, len);
- strescseq.len += len;
+ goto check_control_code;
+ }
+
+
+ if (IS_SET(MODE_SIXEL)) {
+ /* TODO: implement sixel mode */
return;
- } else {
- /*
- * Here is a bug in terminals. If the user never sends
- * some code to stop the str or esc command, then st
- * will stop responding. But this is better than
- * silently failing with unknown characters. At least
- * then users will report back.
- *
- * In the case users ever get fixed, here is the code:
- */
- /*
- * term.esc = 0;
- * strhandle();
- */
+ }
+ if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
+ term.mode |= MODE_SIXEL;
+
+ if (strescseq.len+len >= sizeof(strescseq.buf)-1) {
+ /*
+ * Here is a bug in terminals. If the user never sends
+ * some code to stop the str or esc command, then st
+ * will stop responding. But this is better than
+ * silently failing with unknown characters. At least
+ * then users will report back.
+ *
+ * In the case users ever get fixed, here is the code:
+ */
+ /*
+ * term.esc = 0;
+ * strhandle();
+ */
return;
}
+
+ memmove(&strescseq.buf[strescseq.len], c, len);
+ strescseq.len += len;
+ return;
}
+check_control_code:
/*
* Actions of control codes must be performed as soon they arrive
* because they can be embedded inside a control sequence, and
* they must not cause conflicts with sequences.
*/
- if(control) {
- tcontrolcode(ascii);
+ if (control) {
+ tcontrolcode(u);
/*
* control codes are not shown ever
*/
return;
- } else if(term.esc & ESC_START) {
- if(term.esc & ESC_CSI) {
- csiescseq.buf[csiescseq.len++] = ascii;
- if(BETWEEN(ascii, 0x40, 0x7E)
+ } else if (term.esc & ESC_START) {
+ if (term.esc & ESC_CSI) {
+ csiescseq.buf[csiescseq.len++] = u;
+ if (BETWEEN(u, 0x40, 0x7E)
|| csiescseq.len >= \
sizeof(csiescseq.buf)-1) {
term.esc = 0;
@@ -2712,12 +2388,14 @@ tputc(char *c, int len) {
csihandle();
}
return;
- } else if(term.esc & ESC_ALTCHARSET) {
- tdeftran(ascii);
- } else if(term.esc & ESC_TEST) {
- tdectest(ascii);
+ } else if (term.esc & ESC_UTF8) {
+ tdefutf8(u);
+ } else if (term.esc & ESC_ALTCHARSET) {
+ tdeftran(u);
+ } else if (term.esc & ESC_TEST) {
+ tdectest(u);
} else {
- if (!eschandle(ascii))
+ if (!eschandle(u))
return;
/* sequence already finished */
}
@@ -2728,49 +2406,82 @@ tputc(char *c, int len) {
*/
return;
}
- if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
- selclear(NULL);
+ if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+ selclear();
gp = &term.line[term.c.y][term.c.x];
- if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+ if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
gp->mode |= ATTR_WRAP;
tnewline(1);
gp = &term.line[term.c.y][term.c.x];
}
- if(IS_SET(MODE_INSERT) && term.c.x+width < term.col)
+ if (IS_SET(MODE_INSERT) && term.c.x+width < term.col)
memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
- if(term.c.x+width > term.col) {
+ if (term.c.x+width > term.col) {
tnewline(1);
gp = &term.line[term.c.y][term.c.x];
}
- tsetchar(c, &term.c.attr, term.c.x, term.c.y);
+ tsetchar(u, &term.c.attr, term.c.x, term.c.y);
- if(width == 2) {
+ if (width == 2) {
gp->mode |= ATTR_WIDE;
- if(term.c.x+1 < term.col) {
- gp[1].c[0] = '\0';
+ if (term.c.x+1 < term.col) {
+ gp[1].u = '\0';
gp[1].mode = ATTR_WDUMMY;
}
}
- if(term.c.x+width < term.col) {
+ if (term.c.x+width < term.col) {
tmoveto(term.c.x+width, term.c.y);
} else {
term.c.state |= CURSOR_WRAPNEXT;
}
}
+int
+twrite(const char *buf, int buflen, int show_ctrl)
+{
+ int charsize;
+ Rune u;
+ int n;
+
+ for (n = 0; n < buflen; n += charsize) {
+ if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
+ /* process a complete utf8 char */
+ charsize = utf8decode(buf + n, &u, buflen - n);
+ if (charsize == 0)
+ break;
+ } else {
+ u = buf[n] & 0xFF;
+ charsize = 1;
+ }
+ if (show_ctrl && ISCONTROL(u)) {
+ if (u & 0x80) {
+ u &= 0x7f;
+ tputc('^');
+ tputc('[');
+ } else if (u != '\n' && u != '\r' && u != '\t') {
+ u ^= 0x40;
+ tputc('^');
+ }
+ }
+ tputc(u);
+ }
+ return n;
+}
+
void
-tresize(int col, int row) {
+tresize(int col, int row)
+{
int i;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
- bool *bp;
+ int *bp;
TCursor c;
- if(col < 1 || row < 1) {
+ if (col < 1 || row < 1) {
fprintf(stderr,
"tresize: error resizing to %dx%d\n", col, row);
return;
@@ -2781,15 +2492,16 @@ tresize(int col, int row) {
* tscrollup would work here, but we can optimize to
* memmove because we're freeing the earlier lines
*/
- for(i = 0; i <= term.c.y - row; i++) {
+ for (i = 0; i <= term.c.y - row; i++) {
free(term.line[i]);
free(term.alt[i]);
}
- if(i > 0) {
+ /* ensure that both src and dst are not NULL */
+ if (i > 0) {
memmove(term.line, term.line + i, row * sizeof(Line));
memmove(term.alt, term.alt + i, row * sizeof(Line));
}
- for(i += row; i < term.row; i++) {
+ for (i += row; i < term.row; i++) {
free(term.line[i]);
free(term.alt[i]);
}
@@ -2801,23 +2513,23 @@ tresize(int col, int row) {
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
/* resize each row to new width, zero-pad if needed */
- for(i = 0; i < minrow; i++) {
+ for (i = 0; i < minrow; i++) {
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
}
/* allocate any new rows */
- for(/* i == minrow */; i < row; i++) {
+ for (/* i = minrow */; i < row; i++) {
term.line[i] = xmalloc(col * sizeof(Glyph));
term.alt[i] = xmalloc(col * sizeof(Glyph));
}
- if(col > term.col) {
+ if (col > term.col) {
bp = term.tabs + term.col;
memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
- while(--bp > term.tabs && !*bp)
+ while (--bp > term.tabs && !*bp)
/* nothing */ ;
- for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+ for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
*bp = 1;
}
/* update terminal size */
@@ -2829,11 +2541,11 @@ tresize(int col, int row) {
tmoveto(term.c.x, term.c.y);
/* Clearing both screens (it makes dirty all lines) */
c = term.c;
- for(i = 0; i < 2; i++) {
- if(mincol < col && 0 < minrow) {
+ for (i = 0; i < 2; i++) {
+ if (mincol < col && 0 < minrow) {
tclearregion(mincol, 0, col - 1, minrow - 1);
}
- if(0 < col && minrow < row) {
+ if (0 < col && minrow < row) {
tclearregion(0, minrow, col - 1, row - 1);
}
tswapscreen();
@@ -2843,1231 +2555,51 @@ tresize(int col, int row) {
}
void
-xresize(int col, int row) {
- xw.tw = MAX(1, col * xw.cw);
- xw.th = MAX(1, row * xw.ch);
-
- XFreePixmap(xw.dpy, xw.buf);
- xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
- DefaultDepth(xw.dpy, xw.scr));
- XftDrawChange(xw.draw, xw.buf);
- xclear(0, 0, xw.w, xw.h);
-}
-
-ushort
-sixd_to_16bit(int x) {
- return x == 0 ? 0 : 0x3737 + 0x2828 * x;
+resettitle(void)
+{
+ xsettitle(NULL);
}
void
-xloadcols(void) {
- int i;
- XRenderColor color = { .alpha = 0xffff };
- static bool loaded;
- Color *cp;
-
- if(loaded) {
- for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp)
- XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
- }
-
- /* load colors [0-15] and [256-LEN(colorname)] (config.h) */
- for(i = 0; i < LEN(colorname); i++) {
- if(!colorname[i])
+drawregion(int x1, int y1, int x2, int y2)
+{
+ int y;
+ for (y = y1; y < y2; y++) {
+ if (!term.dirty[y])
continue;
- if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) {
- die("Could not allocate color '%s'\n", colorname[i]);
- }
- }
-
- /* load colors [16-231] ; same colors as xterm */
- for(i = 16; i < 6*6*6+16; i++) {
- 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 );
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i]))
- die("Could not allocate color %d\n", i);
- }
- /* load colors [232-255] ; grayscale */
- for(; i < 256; i++) {
- color.red = color.green = color.blue = 0x0808 + 0x0a0a * (i-(6*6*6+16));
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i]))
- die("Could not allocate color %d\n", i);
- }
- loaded = true;
-}
-
-int
-xsetcolorname(int x, const char *name) {
- XRenderColor color = { .alpha = 0xffff };
- Color ncolor;
-
- if(!BETWEEN(x, 0, LEN(colorname)))
- return 1;
-
- if(!name) {
- if(BETWEEN(x, 16, 16 + 215)) { /* 256 color */
- color.red = sixd_to_16bit( ((x-16)/36)%6 );
- color.green = sixd_to_16bit( ((x-16)/6) %6 );
- color.blue = sixd_to_16bit( ((x-16)/1) %6 );
- if(!XftColorAllocValue(xw.dpy, xw.vis,
- xw.cmap, &color, &ncolor)) {
- return 1;
- }
-
- XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
- dc.col[x] = ncolor;
- return 0;
- } else if(BETWEEN(x, 16 + 216, 255)) { /* greyscale */
- color.red = color.green = color.blue = \
- 0x0808 + 0x0a0a * (x - (16 + 216));
- if(!XftColorAllocValue(xw.dpy, xw.vis,
- xw.cmap, &color, &ncolor)) {
- return 1;
- }
-
- XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
- dc.col[x] = ncolor;
- return 0;
- } else { /* system colors */
- name = colorname[x];
- }
+ term.dirty[y] = 0;
+ xdrawline(term.line[y], x1, y, x2);
}
- if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &ncolor))
- return 1;
-
- XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
- dc.col[x] = ncolor;
- return 0;
-}
-
-void
-xtermclear(int col1, int row1, int col2, int row2) {
- XftDrawRect(xw.draw,
- &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
- borderpx + col1 * xw.cw,
- borderpx + row1 * xw.ch,
- (col2-col1+1) * xw.cw,
- (row2-row1+1) * xw.ch);
-}
-
-/*
- * Absolute coordinates.
- */
-void
-xclear(int x1, int y1, int x2, int y2) {
- XftDrawRect(xw.draw,
- &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
- x1, y1, x2-x1, y2-y1);
}
void
-xhints(void) {
- XClassHint class = {opt_class ? opt_class : termname, termname};
- XWMHints wm = {.flags = InputHint, .input = 1};
- XSizeHints *sizeh = NULL;
-
- sizeh = XAllocSizeHints();
-
- sizeh->flags = PSize | PResizeInc | PBaseSize;
- sizeh->height = xw.h;
- sizeh->width = xw.w;
- sizeh->height_inc = xw.ch;
- sizeh->width_inc = xw.cw;
- sizeh->base_height = 2 * borderpx;
- sizeh->base_width = 2 * borderpx;
- if(xw.isfixed == True) {
- sizeh->flags |= PMaxSize | PMinSize;
- sizeh->min_width = sizeh->max_width = xw.w;
- sizeh->min_height = sizeh->max_height = xw.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);
-}
+draw(void)
+{
+ int cx = term.c.x;
-int
-xgeommasktogravity(int mask) {
- switch(mask & (XNegative|YNegative)) {
- case 0:
- return NorthWestGravity;
- case XNegative:
- return NorthEastGravity;
- case YNegative:
- return SouthWestGravity;
- }
- return SouthEastGravity;
-}
-
-int
-xloadfont(Font *f, FcPattern *pattern) {
- FcPattern *match;
- FcResult result;
-
- match = FcFontMatch(NULL, pattern, &result);
- if(!match)
- return 1;
-
- if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
- FcPatternDestroy(match);
- return 1;
- }
-
- f->set = NULL;
- f->pattern = FcPatternDuplicate(pattern);
-
- f->ascent = f->match->ascent;
- f->descent = f->match->descent;
- f->lbearing = 0;
- f->rbearing = f->match->max_advance_width;
+ if (!xstartdraw())
+ return;
- f->height = f->ascent + f->descent;
- f->width = f->lbearing + f->rbearing;
+ /* adjust cursor position */
+ LIMIT(term.ocx, 0, term.col-1);
+ LIMIT(term.ocy, 0, term.row-1);
+ if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
+ term.ocx--;
+ if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
+ cx--;
- return 0;
+ drawregion(0, 0, term.col, term.row);
+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
+ term.ocx = cx, term.ocy = term.c.y;
+ xfinishdraw();
+ xximspot(term.ocx, term.ocy);
}
void
-xloadfonts(char *fontstr, double fontsize) {
- FcPattern *pattern;
- FcResult r_sz, r_psz;
- double fontval;
- float ceilf(float);
-
- if(fontstr[0] == '-') {
- pattern = XftXlfdParse(fontstr, False, False);
- } else {
- pattern = FcNameParse((FcChar8 *)fontstr);
- }
-
- if(!pattern)
- die("st: 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 {
- r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
- r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
- if(r_psz == FcResultMatch) {
- usedfontsize = fontval;
- } else if(r_sz == 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;
- }
-
- FcConfigSubstitute(0, pattern, FcMatchPattern);
- FcDefaultSubstitute(pattern);
-
- if(xloadfont(&dc.font, pattern))
- die("st: 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. */
- xw.cw = ceilf(dc.font.width * cwscale);
- xw.ch = ceilf(dc.font.height * chscale);
-
- FcPatternDel(pattern, FC_SLANT);
- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
- if(xloadfont(&dc.ifont, pattern))
- die("st: can't open font %s\n", fontstr);
-
- FcPatternDel(pattern, FC_WEIGHT);
- FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
- if(xloadfont(&dc.ibfont, pattern))
- die("st: can't open font %s\n", fontstr);
-
- FcPatternDel(pattern, FC_SLANT);
- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
- if(xloadfont(&dc.bfont, pattern))
- die("st: 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) {
- /* 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
-xzoom(const Arg *arg) {
- Arg larg;
-
- larg.i = usedfontsize + arg->i;
- xzoomabs(&larg);
-}
-
-void
-xzoomabs(const Arg *arg) {
- xunloadfonts();
- xloadfonts(usedfont, arg->i);
- cresize(0, 0);
- redraw();
- xhints();
-}
-
-void
-xzoomreset(const Arg *arg) {
- Arg larg;
-
- if(defaultfontsize > 0) {
- larg.i = defaultfontsize;
- xzoomabs(&larg);
- }
-}
-
-void
-xinit(void) {
- XGCValues gcvalues;
- Cursor cursor;
- Window parent;
- pid_t thispid = getpid();
-
- if(!(xw.dpy = XOpenDisplay(NULL)))
- die("Can't open display\n");
- xw.scr = XDefaultScreen(xw.dpy);
- xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-
- /* font */
- if(!FcInit())
- die("Could not init fontconfig.\n");
-
- usedfont = (opt_font == NULL)? font : opt_font;
- xloadfonts(usedfont, 0);
-
- /* colors */
- xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
- xloadcols();
-
- /* adjust fixed window geometry */
- xw.w = 2 * borderpx + term.col * xw.cw;
- xw.h = 2 * borderpx + term.row * xw.ch;
- if(xw.gm & XNegative)
- xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2;
- if(xw.gm & YNegative)
- xw.t += DisplayWidth(xw.dpy, xw.scr) - xw.h - 2;
-
- /* Events */
- xw.attrs.background_pixel = dc.col[defaultbg].pixel;
- xw.attrs.border_pixel = dc.col[defaultbg].pixel;
- xw.attrs.bit_gravity = NorthWestGravity;
- xw.attrs.event_mask = FocusChangeMask | KeyPressMask
- | ExposureMask | VisibilityChangeMask | StructureNotifyMask
- | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- xw.attrs.colormap = xw.cmap;
-
- if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
- parent = XRootWindow(xw.dpy, xw.scr);
- xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
- xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
- xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- | CWEventMask | CWColormap, &xw.attrs);
-
- memset(&gcvalues, 0, sizeof(gcvalues));
- gcvalues.graphics_exposures = False;
- dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
- &gcvalues);
- xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
- DefaultDepth(xw.dpy, xw.scr));
- XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
-
- /* Xft rendering context */
- xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
-
- /* input methods */
- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
- XSetLocaleModifiers("@im=local");
- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
- XSetLocaleModifiers("@im=");
- if((xw.xim = XOpenIM(xw.dpy,
- NULL, NULL, NULL)) == NULL) {
- die("XOpenIM failed. Could not open input"
- " device.\n");
- }
- }
- }
- xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
- | XIMStatusNothing, XNClientWindow, xw.win,
- XNFocusWindow, xw.win, NULL);
- if(xw.xic == NULL)
- die("XCreateIC failed. Could not obtain input method.\n");
-
- /* white cursor, black outline */
- cursor = XCreateFontCursor(xw.dpy, XC_xterm);
- XDefineCursor(xw.dpy, xw.win, cursor);
- XRecolorCursor(xw.dpy, cursor,
- &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
- &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
-
- 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);
- XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
-
- xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
- XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
- PropModeReplace, (uchar *)&thispid, 1);
-
- xresettitle();
- XMapWindow(xw.dpy, xw.win);
- xhints();
- XSync(xw.dpy, False);
-}
-
-void
-xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
- int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
- width = charlen * xw.cw, xp, i;
- int frcflags, charexists;
- int u8fl, u8fblen, u8cblen, doesexist;
- char *u8c, *u8fs;
- long unicodep;
- Font *font = &dc.font;
- FcResult fcres;
- FcPattern *fcpattern, *fontpattern;
- FcFontSet *fcsets[] = { NULL };
- FcCharSet *fccharset;
- Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
- XRenderColor colfg, colbg;
- XRectangle r;
- int oneatatime;
-
- frcflags = FRC_NORMAL;
-
- if(base.mode & ATTR_ITALIC) {
- if(base.fg == defaultfg)
- base.fg = defaultitalic;
- font = &dc.ifont;
- frcflags = FRC_ITALIC;
- } else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
- if(base.fg == defaultfg)
- base.fg = defaultitalic;
- font = &dc.ibfont;
- frcflags = FRC_ITALICBOLD;
- } else if(base.mode & ATTR_UNDERLINE) {
- if(base.fg == defaultfg)
- base.fg = defaultunderline;
- }
-
- 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];
- }
-
- if(base.mode & ATTR_BOLD) {
- /*
- * change basic system colors [0-7]
- * to bright system colors [8-15]
- */
- if(BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT))
- fg = &dc.col[base.fg + 8];
-
- if(base.mode & ATTR_ITALIC) {
- font = &dc.ibfont;
- frcflags = FRC_ITALICBOLD;
- } else {
- font = &dc.bfont;
- frcflags = FRC_BOLD;
- }
- }
-
- 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_REVERSE) {
- temp = fg;
- fg = bg;
- bg = temp;
- }
-
- if(base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
- colfg.red = fg->color.red / 2;
- colfg.green = fg->color.green / 2;
- colfg.blue = fg->color.blue / 2;
- XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
- fg = &revfg;
- }
-
- if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
- fg = bg;
-
- if(base.mode & ATTR_INVISIBLE)
- fg = bg;
-
- /* Intelligent cleaning up of the borders. */
- if(x == 0) {
- xclear(0, (y == 0)? 0 : winy, borderpx,
- winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
- }
- if(x + charlen >= term.col) {
- xclear(winx + width, (y == 0)? 0 : winy, xw.w,
- ((y >= term.row-1)? xw.h : (winy + xw.ch)));
- }
- if(y == 0)
- xclear(winx, 0, winx + width, borderpx);
- if(y == term.row-1)
- xclear(winx, winy + xw.ch, winx + width, xw.h);
-
- /* Clean up the region we want to draw to. */
- XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
-
- /* Set the clip region because Xft is sometimes dirty. */
- r.x = 0;
- r.y = 0;
- r.height = xw.ch;
- r.width = width;
- XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
-
- for(xp = winx; bytelen > 0;) {
- /*
- * Search for the range in the to be printed string of glyphs
- * that are in the main font. Then print that range. If
- * some glyph is found that is not in the font, do the
- * fallback dance.
- */
- u8fs = s;
- u8fblen = 0;
- u8fl = 0;
- oneatatime = font->width != xw.cw;
- for(;;) {
- u8c = s;
- u8cblen = utf8decode(s, &unicodep, UTF_SIZ);
- s += u8cblen;
- bytelen -= u8cblen;
-
- doesexist = XftCharExists(xw.dpy, font->match, unicodep);
- if(doesexist) {
- u8fl++;
- u8fblen += u8cblen;
- if(!oneatatime && bytelen > 0)
- continue;
- }
-
- if(u8fl > 0) {
- XftDrawStringUtf8(xw.draw, fg,
- font->match, xp,
- winy + font->ascent,
- (FcChar8 *)u8fs,
- u8fblen);
- xp += xw.cw * u8fl;
- }
- break;
- }
- if(doesexist) {
- if(oneatatime)
- continue;
- break;
- }
-
- /* Search the font cache. */
- for(i = 0; i < frclen; i++) {
- charexists = XftCharExists(xw.dpy, frc[i].font, unicodep);
- /* Everything correct. */
- if(charexists && frc[i].flags == frcflags)
- break;
- /* We got a default font for a not found glyph. */
- if(!charexists && frc[i].flags == frcflags \
- && frc[i].unicodep == unicodep) {
- break;
- }
- }
-
- /* Nothing was found. */
- if(i >= frclen) {
- if(!font->set)
- font->set = FcFontSort(0, font->pattern,
- FcTrue, 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, unicodep);
- FcPatternAddCharSet(fcpattern, FC_CHARSET,
- fccharset);
- FcPatternAddBool(fcpattern, FC_SCALABLE,
- FcTrue);
-
- FcConfigSubstitute(0, fcpattern,
- FcMatchPattern);
- FcDefaultSubstitute(fcpattern);
-
- fontpattern = FcFontSetMatch(0, fcsets, 1,
- fcpattern, &fcres);
-
- /*
- * Overwrite or create the new cache entry.
- */
- if(frclen >= LEN(frc)) {
- frclen = LEN(frc) - 1;
- XftFontClose(xw.dpy, frc[frclen].font);
- frc[frclen].unicodep = 0;
- }
-
- frc[frclen].font = XftFontOpenPattern(xw.dpy,
- fontpattern);
- frc[frclen].flags = frcflags;
- frc[frclen].unicodep = unicodep;
-
- i = frclen;
- frclen++;
-
- FcPatternDestroy(fcpattern);
- FcCharSetDestroy(fccharset);
- }
-
- XftDrawStringUtf8(xw.draw, fg, frc[i].font,
- xp, winy + frc[i].font->ascent,
- (FcChar8 *)u8c, u8cblen);
-
- xp += xw.cw * wcwidth(unicodep);
- }
-
- /*
- * This is how the loop above actually should be. Why does the
- * application have to care about font details?
- *
- * I have to repeat: Xft and Fontconfig are design failures.
- */
- /*
- XftDrawStringUtf8(xw.draw, fg, font->set, winx,
- winy + font->ascent, (FcChar8 *)s, bytelen);
- */
-
- if(base.mode & ATTR_UNDERLINE) {
- XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
- width, 1);
- }
-
- if(base.mode & ATTR_STRUCK) {
- XftDrawRect(xw.draw, fg, winx, winy + 2 * font->ascent / 3,
- width, 1);
- }
-
- /* Reset clip to none. */
- XftDrawSetClip(xw.draw, 0);
-}
-
-void
-xdrawcursor(void) {
- static int oldx = 0, oldy = 0;
- int sl, width, curx;
- Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
-
- LIMIT(oldx, 0, term.col-1);
- LIMIT(oldy, 0, term.row-1);
-
- curx = term.c.x;
-
- /* adjust position if in dummy */
- if(term.line[oldy][oldx].mode & ATTR_WDUMMY)
- oldx--;
- if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
- curx--;
-
- memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
-
- /* remove the old cursor */
- sl = utf8len(term.line[oldy][oldx].c);
- width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;
- xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
- oldy, width, sl);
-
- if(IS_SET(MODE_HIDE))
- return;
-
- /* draw the new one */
- if(xw.state & WIN_FOCUSED) {
- switch (xw.cursor) {
- case 0: /* Blinking Block */
- case 1: /* Blinking Block (Default) */
- case 2: /* Steady Block */
- if(IS_SET(MODE_REVERSE)) {
- g.mode |= ATTR_REVERSE;
- g.fg = defaultcs;
- g.bg = defaultfg;
- }
-
- sl = utf8len(g.c);
- width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
- ? 2 : 1;
- xdraws(g.c, g, term.c.x, term.c.y, width, sl);
- break;
- case 3: /* Blinking Underline */
- case 4: /* Steady Underline */
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
- xw.cw, cursorthickness);
- break;
- case 5: /* Blinking bar */
- case 6: /* Steady bar */
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + term.c.y * xw.ch,
- cursorthickness, xw.ch);
- break;
- }
- } else {
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + term.c.y * xw.ch,
- xw.cw - 1, 1);
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + term.c.y * xw.ch,
- 1, xw.ch - 1);
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + (curx + 1) * xw.cw - 1,
- borderpx + term.c.y * xw.ch,
- 1, xw.ch - 1);
- XftDrawRect(xw.draw, &dc.col[defaultcs],
- borderpx + curx * xw.cw,
- borderpx + (term.c.y + 1) * xw.ch - 1,
- xw.cw, 1);
- }
- oldx = curx, oldy = term.c.y;
-}
-
-
-void
-xsettitle(char *p) {
- XTextProperty prop;
-
- Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
- &prop);
- XSetWMName(xw.dpy, xw.win, &prop);
- XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
- XFree(prop.value);
-}
-
-void
-xresettitle(void) {
- xsettitle(opt_title ? opt_title : "st");
-}
-
-void
-redraw(void) {
+redraw(void)
+{
tfulldirt();
draw();
}
-
-void
-draw(void) {
- drawregion(0, 0, term.col, term.row);
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
- xw.h, 0, 0);
- XSetForeground(xw.dpy, dc.gc,
- dc.col[IS_SET(MODE_REVERSE)?
- defaultfg : defaultbg].pixel);
-}
-
-void
-drawregion(int x1, int y1, int x2, int y2) {
- int ic, ib, x, y, ox, sl;
- Glyph base, new;
- char buf[DRAW_BUF_SIZ];
- bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
- long unicodep;
-
- if(!(xw.state & WIN_VISIBLE))
- return;
-
- for(y = y1; y < y2; y++) {
- if(!term.dirty[y])
- continue;
-
- xtermclear(0, y, term.col, y);
- term.dirty[y] = 0;
- base = term.line[y][0];
- ic = ib = ox = 0;
- for(x = x1; x < x2; x++) {
- new = term.line[y][x];
- if(new.mode == ATTR_WDUMMY)
- continue;
- if(ena_sel && selected(x, y))
- new.mode ^= ATTR_REVERSE;
- if(ib > 0 && (ATTRCMP(base, new)
- || ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
- xdraws(buf, base, ox, y, ic, ib);
- ic = ib = 0;
- }
- if(ib == 0) {
- ox = x;
- base = new;
- }
-
- sl = utf8decode(new.c, &unicodep, UTF_SIZ);
- memcpy(buf+ib, new.c, sl);
- ib += sl;
- ic += (new.mode & ATTR_WIDE)? 2 : 1;
- }
- if(ib > 0)
- xdraws(buf, base, ox, y, ic, ib);
- }
- xdrawcursor();
-}
-
-void
-expose(XEvent *ev) {
- XExposeEvent *e = &ev->xexpose;
-
- if(xw.state & WIN_REDRAW) {
- if(!e->count)
- xw.state &= ~WIN_REDRAW;
- }
- redraw();
-}
-
-void
-visibility(XEvent *ev) {
- XVisibilityEvent *e = &ev->xvisibility;
-
- if(e->state == VisibilityFullyObscured) {
- xw.state &= ~WIN_VISIBLE;
- } else if(!(xw.state & WIN_VISIBLE)) {
- /* need a full redraw for next Expose, not just a buf copy */
- xw.state |= WIN_VISIBLE | WIN_REDRAW;
- }
-}
-
-void
-unmap(XEvent *ev) {
- xw.state &= ~WIN_VISIBLE;
-}
-
-void
-xsetpointermotion(int set) {
- MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
- XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
-}
-
-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
-focus(XEvent *ev) {
- XFocusChangeEvent *e = &ev->xfocus;
-
- if(e->mode == NotifyGrab)
- return;
-
- if(ev->type == FocusIn) {
- XSetICFocus(xw.xic);
- xw.state |= WIN_FOCUSED;
- xseturgency(0);
- if(IS_SET(MODE_FOCUS))
- ttywrite("\033[I", 3);
- } else {
- XUnsetICFocus(xw.xic);
- xw.state &= ~WIN_FOCUSED;
- if(IS_SET(MODE_FOCUS))
- ttywrite("\033[O", 3);
- }
-}
-
-bool
-match(uint mask, uint state) {
- return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
-}
-
-void
-numlock(const Arg *dummy) {
- term.numlock ^= 1;
-}
-
-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(term.numlock && kp->appkey == 2)
- continue;
-
- if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
- continue;
-
- if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
- continue;
-
- return kp->s;
- }
-
- return NULL;
-}
-
-void
-kpress(XEvent *ev) {
- XKeyEvent *e = &ev->xkey;
- KeySym ksym;
- char buf[32], *customkey;
- int len;
- long c;
- Status status;
- Shortcut *bp;
-
- if(IS_SET(MODE_KBDLOCK))
- return;
-
- len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
- /* 1. shortcuts */
- for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
- if(ksym == bp->keysym && match(bp->mod, e->state)) {
- bp->func(&(bp->arg));
- return;
- }
- }
-
- /* 2. custom keys from config.h */
- if((customkey = kmap(ksym, e->state))) {
- ttysend(customkey, strlen(customkey));
- 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, UTF_SIZ);
- }
- } else {
- buf[1] = buf[0];
- buf[0] = '\033';
- len = 2;
- }
- }
- ttysend(buf, len);
-}
-
-
-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) {
- xw.state |= WIN_FOCUSED;
- xseturgency(0);
- } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
- xw.state &= ~WIN_FOCUSED;
- }
- } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
- /* Send SIGHUP to shell */
- kill(pid, SIGHUP);
- exit(EXIT_SUCCESS);
- }
-}
-
-void
-cresize(int width, int height) {
- int col, row;
-
- if(width != 0)
- xw.w = width;
- if(height != 0)
- xw.h = height;
-
- col = (xw.w - 2 * borderpx) / xw.cw;
- row = (xw.h - 2 * borderpx) / xw.ch;
-
- tresize(col, row);
- xresize(col, row);
- ttyresize();
-}
-
-void
-resize(XEvent *e) {
- if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
- return;
-
- cresize(e->xconfigure.width, e->xconfigure.height);
-}
-
-void
-run(void) {
- XEvent ev;
- int w = xw.w, h = xw.h;
- fd_set rfd;
- int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
- struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
- long deltatime;
-
- /* Waiting for window mapping */
- do {
- XNextEvent(xw.dpy, &ev);
- if(ev.type == ConfigureNotify) {
- w = ev.xconfigure.width;
- h = ev.xconfigure.height;
- }
- } while(ev.type != MapNotify);
-
- ttynew();
- cresize(w, h);
-
- clock_gettime(CLOCK_MONOTONIC, &last);
- lastblink = last;
-
- for(xev = actionfps;;) {
- FD_ZERO(&rfd);
- FD_SET(cmdfd, &rfd);
- FD_SET(xfd, &rfd);
-
- if(pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
- if(errno == EINTR)
- continue;
- die("select failed: %s\n", strerror(errno));
- }
- if(FD_ISSET(cmdfd, &rfd)) {
- ttyread();
- if(blinktimeout) {
- blinkset = tattrset(ATTR_BLINK);
- if(!blinkset)
- MODBIT(term.mode, 0, MODE_BLINK);
- }
- }
-
- if(FD_ISSET(xfd, &rfd))
- xev = actionfps;
-
- clock_gettime(CLOCK_MONOTONIC, &now);
- drawtimeout.tv_sec = 0;
- drawtimeout.tv_nsec = (1000/xfps) * 1E6;
- tv = &drawtimeout;
-
- dodraw = 0;
- if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
- tsetdirtattr(ATTR_BLINK);
- term.mode ^= MODE_BLINK;
- lastblink = now;
- dodraw = 1;
- }
- deltatime = TIMEDIFF(now, last);
- if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
- || deltatime < 0) {
- dodraw = 1;
- last = now;
- }
-
- if(dodraw) {
- while(XPending(xw.dpy)) {
- XNextEvent(xw.dpy, &ev);
- if(XFilterEvent(&ev, None))
- continue;
- if(handler[ev.type])
- (handler[ev.type])(&ev);
- }
-
- draw();
- XFlush(xw.dpy);
-
- if(xev && !FD_ISSET(xfd, &rfd))
- xev--;
- if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
- if(blinkset) {
- if(TIMEDIFF(now, lastblink) \
- > blinktimeout) {
- drawtimeout.tv_nsec = 1000;
- } else {
- drawtimeout.tv_nsec = (1E6 * \
- (blinktimeout - \
- TIMEDIFF(now,
- lastblink)));
- }
- drawtimeout.tv_sec = \
- drawtimeout.tv_nsec / 1E9;
- drawtimeout.tv_nsec %= (long)1E9;
- } else {
- tv = NULL;
- }
- }
- }
- }
-}
-
-void
-usage(void) {
- die("%s " VERSION " (c) 2010-2015 st engineers\n" \
- "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
- " [-i] [-t title] [-w windowid] [-e command ...]\n", argv0);
-}
-
-int
-main(int argc, char *argv[]) {
- char *titles;
- uint cols = 80, rows = 24;
-
- xw.l = xw.t = 0;
- xw.isfixed = False;
- xw.cursor = 0;
-
- ARGBEGIN {
- case 'a':
- allowaltscreen = false;
- break;
- case 'c':
- opt_class = EARGF(usage());
- break;
- case 'e':
- /* eat all remaining arguments */
- if(argc > 1) {
- opt_cmd = &argv[1];
- if(argv[1] != NULL && opt_title == NULL) {
- titles = xstrdup(argv[1]);
- opt_title = basename(titles);
- }
- }
- 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 = True;
- break;
- case 'o':
- opt_io = EARGF(usage());
- break;
- case 't':
- opt_title = EARGF(usage());
- break;
- case 'w':
- opt_embed = EARGF(usage());
- break;
- case 'v':
- default:
- usage();
- } ARGEND;
-
-run:
- setlocale(LC_CTYPE, "");
- XSetLocaleModifiers("");
- tnew(MAX(cols, 1), MAX(rows, 1));
- xinit();
- selinit();
- run();
-
- return 0;
-}
-