2015-04-13 12:03:12 +00:00
|
|
|
|
/* See LICENSE for license details. */
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <fcntl.h>
|
2009-10-28 13:34:22 +00:00
|
|
|
|
#include <limits.h>
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* for BTN_* definitions */
|
|
|
|
|
#include <linux/input.h>
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <locale.h>
|
2012-10-28 05:54:08 +00:00
|
|
|
|
#include <pwd.h>
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <signal.h>
|
2013-11-25 15:06:22 +00:00
|
|
|
|
#include <stdint.h>
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <sys/ioctl.h>
|
2016-10-31 06:54:56 +00:00
|
|
|
|
#include <sys/mman.h>
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <sys/select.h>
|
|
|
|
|
#include <sys/stat.h>
|
2012-01-21 22:14:41 +00:00
|
|
|
|
#include <sys/time.h>
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/wait.h>
|
2015-09-08 10:10:11 +00:00
|
|
|
|
#include <termios.h>
|
2012-01-21 22:14:41 +00:00
|
|
|
|
#include <time.h>
|
2009-06-16 00:23:46 +00:00
|
|
|
|
#include <unistd.h>
|
2013-06-06 17:09:18 +00:00
|
|
|
|
#include <libgen.h>
|
2016-10-31 06:54:56 +00:00
|
|
|
|
#include <wayland-client.h>
|
|
|
|
|
#include <wayland-cursor.h>
|
|
|
|
|
#include <xkbcommon/xkbcommon.h>
|
|
|
|
|
#include <wld/wld.h>
|
|
|
|
|
#include <wld/wayland.h>
|
2012-10-04 20:59:45 +00:00
|
|
|
|
#include <fontconfig/fontconfig.h>
|
2013-09-07 10:41:36 +00:00
|
|
|
|
#include <wchar.h>
|
2012-11-11 18:38:41 +00:00
|
|
|
|
|
2013-04-03 19:00:38 +00:00
|
|
|
|
#include "arg.h"
|
2017-01-25 22:10:56 +00:00
|
|
|
|
#include "xdg-shell-unstable-v6-client-protocol.h"
|
2013-04-03 19:00:38 +00:00
|
|
|
|
|
|
|
|
|
char *argv0;
|
|
|
|
|
|
2010-08-30 11:04:19 +00:00
|
|
|
|
#if defined(__linux)
|
2010-08-28 01:18:22 +00:00
|
|
|
|
#include <pty.h>
|
2010-11-24 13:27:44 +00:00
|
|
|
|
#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
2010-08-28 01:18:22 +00:00
|
|
|
|
#include <util.h>
|
2010-08-30 11:04:19 +00:00
|
|
|
|
#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
2010-08-28 01:18:22 +00:00
|
|
|
|
#include <libutil.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2010-09-01 23:37:01 +00:00
|
|
|
|
|
2009-06-16 00:23:46 +00:00
|
|
|
|
/* Arbitrary sizes */
|
2014-03-25 19:20:26 +00:00
|
|
|
|
#define UTF_INVALID 0xFFFD
|
2013-01-18 18:11:25 +00:00
|
|
|
|
#define UTF_SIZ 4
|
|
|
|
|
#define ESC_BUF_SIZ (128*UTF_SIZ)
|
2010-02-08 22:16:55 +00:00
|
|
|
|
#define ESC_ARG_SIZ 16
|
2013-01-18 18:11:25 +00:00
|
|
|
|
#define STR_BUF_SIZ ESC_BUF_SIZ
|
|
|
|
|
#define STR_ARG_SIZ ESC_ARG_SIZ
|
2016-10-31 06:54:56 +00:00
|
|
|
|
#define DRAW_BUF_SIZ 20*1024
|
2012-11-15 14:36:13 +00:00
|
|
|
|
#define XK_ANY_MOD UINT_MAX
|
|
|
|
|
#define XK_NO_MOD 0
|
2013-02-16 12:57:12 +00:00
|
|
|
|
#define XK_SWITCH_MOD (1<<13)
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
#define MOD_MASK_ANY UINT_MAX
|
|
|
|
|
#define MOD_MASK_NONE 0
|
|
|
|
|
#define MOD_MASK_CTRL (1<<0)
|
|
|
|
|
#define MOD_MASK_ALT (1<<1)
|
|
|
|
|
#define MOD_MASK_SHIFT (1<<2)
|
|
|
|
|
#define MOD_MASK_LOGO (1<<3)
|
|
|
|
|
|
|
|
|
|
#define AXIS_VERTICAL WL_POINTER_AXIS_VERTICAL_SCROLL
|
|
|
|
|
#define AXIS_HORIZONTAL WL_POINTER_AXIS_HORIZONTAL_SCROLL
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
/* macros */
|
2015-07-10 12:21:52 +00:00
|
|
|
|
#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))
|
2016-03-08 03:26:04 +00:00
|
|
|
|
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
2015-07-10 12:21:52 +00:00
|
|
|
|
#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)
|
|
|
|
|
#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)))
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
2015-07-10 12:21:52 +00:00
|
|
|
|
#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)
|
2013-07-19 18:34:36 +00:00
|
|
|
|
|
2016-10-08 14:22:18 +00:00
|
|
|
|
/* constants */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
#define ISO14755CMD "dmenu -p codepoint: </dev/null"
|
2013-07-19 18:34:36 +00:00
|
|
|
|
|
2012-02-15 23:33:11 +00:00
|
|
|
|
enum glyph_attribute {
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
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,
|
|
|
|
|
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
2012-02-15 23:33:11 +00:00
|
|
|
|
};
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
2012-02-15 23:33:11 +00:00
|
|
|
|
enum cursor_movement {
|
|
|
|
|
CURSOR_SAVE,
|
|
|
|
|
CURSOR_LOAD
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum cursor_state {
|
|
|
|
|
CURSOR_DEFAULT = 0,
|
2012-11-08 16:15:26 +00:00
|
|
|
|
CURSOR_WRAPNEXT = 1,
|
2013-06-22 21:07:00 +00:00
|
|
|
|
CURSOR_ORIGIN = 2
|
2012-02-15 23:33:11 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum term_mode {
|
2014-08-20 10:05:12 +00:00
|
|
|
|
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,
|
2016-09-13 12:01:18 +00:00
|
|
|
|
MODE_UTF8 = 1 << 21,
|
2016-09-14 06:27:32 +00:00
|
|
|
|
MODE_SIXEL = 1 << 22,
|
2013-06-01 12:37:30 +00:00
|
|
|
|
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
2013-06-22 21:07:00 +00:00
|
|
|
|
|MODE_MOUSEMANY,
|
2012-02-15 23:33:11 +00:00
|
|
|
|
};
|
|
|
|
|
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
enum charset {
|
|
|
|
|
CS_GRAPHIC0,
|
|
|
|
|
CS_GRAPHIC1,
|
|
|
|
|
CS_UK,
|
|
|
|
|
CS_USA,
|
|
|
|
|
CS_MULTI,
|
|
|
|
|
CS_GER,
|
|
|
|
|
CS_FIN
|
|
|
|
|
};
|
|
|
|
|
|
2012-02-15 23:33:11 +00:00
|
|
|
|
enum escape_state {
|
|
|
|
|
ESC_START = 1,
|
2013-06-22 21:07:00 +00:00
|
|
|
|
ESC_CSI = 2,
|
2016-09-14 06:27:32 +00:00
|
|
|
|
ESC_STR = 4, /* OSC, PM, APC */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
ESC_ALTCHARSET = 8,
|
|
|
|
|
ESC_STR_END = 16, /* a final string was encountered */
|
2012-10-07 09:06:17 +00:00
|
|
|
|
ESC_TEST = 32, /* Enter in test mode */
|
2016-09-13 12:01:18 +00:00
|
|
|
|
ESC_UTF8 = 64,
|
2016-09-14 06:27:32 +00:00
|
|
|
|
ESC_DCS =128,
|
2012-02-15 23:33:11 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum window_state {
|
|
|
|
|
WIN_VISIBLE = 1,
|
2015-04-18 17:33:11 +00:00
|
|
|
|
WIN_FOCUSED = 2
|
2012-02-15 23:33:11 +00:00
|
|
|
|
};
|
|
|
|
|
|
2015-05-01 17:13:13 +00:00
|
|
|
|
enum selection_mode {
|
|
|
|
|
SEL_IDLE = 0,
|
|
|
|
|
SEL_EMPTY = 1,
|
|
|
|
|
SEL_READY = 2
|
|
|
|
|
};
|
|
|
|
|
|
2013-02-19 18:08:41 +00:00
|
|
|
|
enum selection_type {
|
|
|
|
|
SEL_REGULAR = 1,
|
|
|
|
|
SEL_RECTANGULAR = 2
|
|
|
|
|
};
|
|
|
|
|
|
2013-04-15 06:28:31 +00:00
|
|
|
|
enum selection_snap {
|
|
|
|
|
SNAP_WORD = 1,
|
|
|
|
|
SNAP_LINE = 2
|
|
|
|
|
};
|
|
|
|
|
|
2012-01-21 22:43:03 +00:00
|
|
|
|
typedef unsigned char uchar;
|
|
|
|
|
typedef unsigned int uint;
|
|
|
|
|
typedef unsigned long ulong;
|
2012-02-15 23:10:32 +00:00
|
|
|
|
typedef unsigned short ushort;
|
2012-01-21 22:43:03 +00:00
|
|
|
|
|
2015-05-05 20:13:21 +00:00
|
|
|
|
typedef uint_least32_t Rune;
|
|
|
|
|
|
2009-06-16 00:23:46 +00:00
|
|
|
|
typedef struct {
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune u; /* character code */
|
2013-09-07 10:41:36 +00:00
|
|
|
|
ushort mode; /* attribute flags */
|
2015-06-03 06:07:55 +00:00
|
|
|
|
uint32_t fg; /* foreground */
|
|
|
|
|
uint32_t bg; /* background */
|
2009-06-16 00:23:46 +00:00
|
|
|
|
} Glyph;
|
|
|
|
|
|
2013-01-20 13:54:35 +00:00
|
|
|
|
typedef Glyph *Line;
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
|
|
|
|
typedef struct {
|
2013-06-22 21:07:00 +00:00
|
|
|
|
Glyph attr; /* current char attributes */
|
2009-06-16 00:23:46 +00:00
|
|
|
|
int x;
|
|
|
|
|
int y;
|
2010-08-29 23:35:37 +00:00
|
|
|
|
char state;
|
2009-06-16 00:23:46 +00:00
|
|
|
|
} TCursor;
|
|
|
|
|
|
2010-02-03 02:25:35 +00:00
|
|
|
|
/* CSI Escape sequence structs */
|
2015-03-18 20:12:47 +00:00
|
|
|
|
/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
|
2009-06-16 00:23:46 +00:00
|
|
|
|
typedef struct {
|
2010-02-08 22:16:55 +00:00
|
|
|
|
char buf[ESC_BUF_SIZ]; /* raw string */
|
2013-06-22 21:07:00 +00:00
|
|
|
|
int len; /* raw string length */
|
2009-06-16 00:23:46 +00:00
|
|
|
|
char priv;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
int arg[ESC_ARG_SIZ];
|
2013-06-22 21:07:00 +00:00
|
|
|
|
int narg; /* nb of args */
|
2015-03-18 20:12:47 +00:00
|
|
|
|
char mode[2];
|
2010-02-03 02:25:35 +00:00
|
|
|
|
} CSIEscape;
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
2012-08-29 21:14:20 +00:00
|
|
|
|
/* STR Escape sequence structs */
|
|
|
|
|
/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
|
|
|
|
|
typedef struct {
|
2013-06-22 21:07:00 +00:00
|
|
|
|
char type; /* ESC type ... */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
char buf[STR_BUF_SIZ]; /* raw string */
|
2013-06-22 21:07:00 +00:00
|
|
|
|
int len; /* raw string length */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
char *args[STR_ARG_SIZ];
|
2013-06-22 21:07:00 +00:00
|
|
|
|
int narg; /* nb of args */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
} STREscape;
|
|
|
|
|
|
2009-06-16 00:23:46 +00:00
|
|
|
|
/* Internal representation of the screen */
|
|
|
|
|
typedef struct {
|
2013-06-22 21:07:00 +00:00
|
|
|
|
int row; /* nb row */
|
|
|
|
|
int col; /* nb col */
|
|
|
|
|
Line *line; /* screen */
|
|
|
|
|
Line *alt; /* alternate screen */
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int *dirty; /* dirtyness of lines */
|
2013-06-22 21:07:00 +00:00
|
|
|
|
TCursor c; /* cursor */
|
|
|
|
|
int top; /* top scroll limit */
|
|
|
|
|
int bot; /* bottom scroll limit */
|
|
|
|
|
int mode; /* terminal mode flags */
|
|
|
|
|
int esc; /* escape state flags */
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
char trantbl[4]; /* charset table translation */
|
|
|
|
|
int charset; /* current charset */
|
|
|
|
|
int icharset; /* selected charset for sequence */
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int numlock; /* lock numbers in keyboard */
|
|
|
|
|
int *tabs;
|
2009-06-16 00:23:46 +00:00
|
|
|
|
} Term;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct xkb_context *ctx;
|
|
|
|
|
struct xkb_keymap *keymap;
|
|
|
|
|
struct xkb_state *state;
|
|
|
|
|
xkb_mod_index_t ctrl, alt, shift, logo;
|
|
|
|
|
unsigned int mods;
|
|
|
|
|
} XKB;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
struct wl_display *dpy;
|
|
|
|
|
struct wl_compositor *cmp;
|
|
|
|
|
struct wl_shm *shm;
|
|
|
|
|
struct wl_seat *seat;
|
|
|
|
|
struct wl_keyboard *keyboard;
|
|
|
|
|
struct wl_pointer *pointer;
|
|
|
|
|
struct wl_data_device_manager *datadevmanager;
|
|
|
|
|
struct wl_data_device *datadev;
|
|
|
|
|
struct wl_data_offer *seloffer;
|
|
|
|
|
struct wl_surface *surface;
|
|
|
|
|
struct wl_buffer *buffer;
|
2017-01-25 22:10:56 +00:00
|
|
|
|
struct zxdg_shell_v6 *shell;
|
|
|
|
|
struct zxdg_surface_v6 *xdgsurface;
|
|
|
|
|
struct zxdg_toplevel_v6 *xdgtoplevel;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
XKB xkb;
|
|
|
|
|
bool configured;
|
|
|
|
|
int px, py; /* pointer x and y */
|
2012-09-17 20:44:27 +00:00
|
|
|
|
int tw, th; /* tty width and height */
|
2013-01-19 14:00:16 +00:00
|
|
|
|
int w, h; /* window width and height */
|
2009-06-16 00:23:46 +00:00
|
|
|
|
int ch; /* char height */
|
|
|
|
|
int cw; /* char width */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int vis;
|
2010-10-16 15:13:22 +00:00
|
|
|
|
char state; /* focus, redraw, visible */
|
2015-03-18 20:12:47 +00:00
|
|
|
|
int cursor; /* cursor style */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct wl_callback * framecb;
|
|
|
|
|
} Wayland;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
struct wld_context *ctx;
|
|
|
|
|
struct wld_font_context *fontctx;
|
|
|
|
|
struct wld_renderer *renderer;
|
|
|
|
|
struct wld_buffer *buffer, *oldbuffer;
|
|
|
|
|
} WLD;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
struct wl_cursor_theme *theme;
|
|
|
|
|
struct wl_cursor *cursor;
|
|
|
|
|
struct wl_surface *surface;
|
|
|
|
|
} Cursor;
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
2013-04-28 15:42:30 +00:00
|
|
|
|
typedef struct {
|
2013-10-06 10:19:12 +00:00
|
|
|
|
uint b;
|
2013-04-28 15:42:30 +00:00
|
|
|
|
uint mask;
|
2013-10-06 10:19:12 +00:00
|
|
|
|
char *s;
|
2015-10-31 08:29:04 +00:00
|
|
|
|
} MouseShortcut;
|
2013-04-28 15:42:30 +00:00
|
|
|
|
|
2009-09-07 19:19:29 +00:00
|
|
|
|
typedef struct {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int axis;
|
|
|
|
|
int dir;
|
|
|
|
|
uint mask;
|
|
|
|
|
char s[ESC_BUF_SIZ];
|
|
|
|
|
} Axiskey;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
xkb_keysym_t k;
|
2012-01-21 22:43:03 +00:00
|
|
|
|
uint mask;
|
2013-10-05 09:45:44 +00:00
|
|
|
|
char *s;
|
2012-11-13 19:04:45 +00:00
|
|
|
|
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
|
2013-06-22 21:07:00 +00:00
|
|
|
|
signed char appkey; /* application keypad */
|
|
|
|
|
signed char appcursor; /* application cursor */
|
|
|
|
|
signed char crlf; /* crlf mode */
|
2009-09-07 19:19:29 +00:00
|
|
|
|
} Key;
|
|
|
|
|
|
2010-08-31 13:36:13 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
int mode;
|
2013-02-19 18:08:41 +00:00
|
|
|
|
int type;
|
2013-04-15 06:28:31 +00:00
|
|
|
|
int snap;
|
2013-05-26 11:07:26 +00:00
|
|
|
|
/*
|
|
|
|
|
* 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
|
|
|
|
|
*/
|
2012-10-06 11:43:01 +00:00
|
|
|
|
struct {
|
|
|
|
|
int x, y;
|
2013-05-26 11:07:26 +00:00
|
|
|
|
} nb, ne, ob, oe;
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
char *primary;
|
|
|
|
|
struct wl_data_source *source;
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int alt;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint32_t tclick1, tclick2;
|
2010-08-31 13:36:13 +00:00
|
|
|
|
} Selection;
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
typedef union {
|
|
|
|
|
int i;
|
2014-04-22 17:59:32 +00:00
|
|
|
|
uint ui;
|
2012-10-28 12:25:53 +00:00
|
|
|
|
float f;
|
|
|
|
|
const void *v;
|
|
|
|
|
} Arg;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
2014-04-22 17:59:32 +00:00
|
|
|
|
uint mod;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
xkb_keysym_t keysym;
|
2012-10-28 12:25:53 +00:00
|
|
|
|
void (*func)(const Arg *);
|
|
|
|
|
const Arg arg;
|
|
|
|
|
} Shortcut;
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
char str[32];
|
|
|
|
|
uint32_t key;
|
|
|
|
|
int len;
|
|
|
|
|
bool started;
|
|
|
|
|
struct timespec last;
|
|
|
|
|
} Repeat;
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
/* function definitions used in config.h */
|
2012-11-25 08:23:02 +00:00
|
|
|
|
static void numlock(const Arg *);
|
2013-02-23 20:50:13 +00:00
|
|
|
|
static void selpaste(const Arg *);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static void wlzoom(const Arg *);
|
|
|
|
|
static void wlzoomabs(const Arg *);
|
|
|
|
|
static void wlzoomreset(const Arg *);
|
2014-02-01 12:41:58 +00:00
|
|
|
|
static void printsel(const Arg *);
|
2014-01-31 22:05:42 +00:00
|
|
|
|
static void printscreen(const Arg *) ;
|
2016-10-08 14:22:18 +00:00
|
|
|
|
static void iso14755(const Arg *);
|
2014-01-31 22:05:42 +00:00
|
|
|
|
static void toggleprinter(const Arg *);
|
2015-09-08 10:10:11 +00:00
|
|
|
|
static void sendbreak(const Arg *);
|
2012-10-28 12:25:53 +00:00
|
|
|
|
|
|
|
|
|
/* Config.h for applying patches and the configuration. */
|
2010-08-19 10:46:54 +00:00
|
|
|
|
#include "config.h"
|
|
|
|
|
|
2012-09-24 08:20:45 +00:00
|
|
|
|
/* Font structure */
|
|
|
|
|
typedef struct {
|
2012-10-04 20:59:45 +00:00
|
|
|
|
int height;
|
|
|
|
|
int width;
|
2012-09-24 08:20:45 +00:00
|
|
|
|
int ascent;
|
|
|
|
|
int descent;
|
2016-10-22 14:36:10 +00:00
|
|
|
|
int badslant;
|
|
|
|
|
int badweight;
|
2012-09-24 08:20:45 +00:00
|
|
|
|
short lbearing;
|
|
|
|
|
short rbearing;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct wld_font *match;
|
2012-12-28 22:52:04 +00:00
|
|
|
|
FcFontSet *set;
|
|
|
|
|
FcPattern *pattern;
|
2012-09-24 08:20:45 +00:00
|
|
|
|
} Font;
|
|
|
|
|
|
2012-02-15 23:10:32 +00:00
|
|
|
|
/* Drawing Context */
|
|
|
|
|
typedef struct {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint32_t col[MAX(LEN(colorname), 256)];
|
2012-09-24 08:20:45 +00:00
|
|
|
|
Font font, bfont, ifont, ibfont;
|
2012-02-15 23:10:32 +00:00
|
|
|
|
} DC;
|
|
|
|
|
|
2012-10-06 07:58:45 +00:00
|
|
|
|
static void die(const char *, ...);
|
2011-04-26 18:22:15 +00:00
|
|
|
|
static void draw(void);
|
2015-02-14 23:34:03 +00:00
|
|
|
|
static void redraw(void);
|
2011-04-21 22:18:53 +00:00
|
|
|
|
static void drawregion(int, int, int, int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void execsh(void);
|
2015-04-13 17:03:53 +00:00
|
|
|
|
static void stty(void);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void sigchld(int);
|
|
|
|
|
static void run(void);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static void cresize(int, int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
|
2010-02-03 02:25:35 +00:00
|
|
|
|
static void csidump(void);
|
|
|
|
|
static void csihandle(void);
|
|
|
|
|
static void csiparse(void);
|
|
|
|
|
static void csireset(void);
|
2015-04-08 23:16:57 +00:00
|
|
|
|
static int eschandle(uchar);
|
2012-08-29 21:14:20 +00:00
|
|
|
|
static void strdump(void);
|
|
|
|
|
static void strhandle(void);
|
|
|
|
|
static void strparse(void);
|
|
|
|
|
static void strreset(void);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
|
2013-04-26 16:41:54 +00:00
|
|
|
|
static int tattrset(int);
|
2014-04-22 17:59:21 +00:00
|
|
|
|
static void tprinter(char *, size_t);
|
2014-02-01 12:41:58 +00:00
|
|
|
|
static void tdumpsel(void);
|
2014-01-31 20:53:53 +00:00
|
|
|
|
static void tdumpline(int);
|
2014-01-31 21:25:51 +00:00
|
|
|
|
static void tdump(void);
|
2013-04-14 16:30:10 +00:00
|
|
|
|
static void tclearregion(int, int, int, int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void tcursor(int);
|
|
|
|
|
static void tdeletechar(int);
|
|
|
|
|
static void tdeleteline(int);
|
|
|
|
|
static void tinsertblank(int);
|
|
|
|
|
static void tinsertblankline(int);
|
2014-06-27 07:15:56 +00:00
|
|
|
|
static int tlinelen(int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void tmoveto(int, int);
|
2014-04-22 17:59:21 +00:00
|
|
|
|
static void tmoveato(int, int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void tnew(int, int);
|
2010-10-16 18:50:29 +00:00
|
|
|
|
static void tnewline(int);
|
2014-04-23 19:12:45 +00:00
|
|
|
|
static void tputtab(int);
|
2015-05-05 20:13:21 +00:00
|
|
|
|
static void tputc(Rune);
|
2010-03-11 22:50:50 +00:00
|
|
|
|
static void treset(void);
|
2014-04-27 22:03:04 +00:00
|
|
|
|
static void tresize(int, int);
|
2010-09-01 21:20:54 +00:00
|
|
|
|
static void tscrollup(int, int);
|
|
|
|
|
static void tscrolldown(int, int);
|
2014-04-22 17:59:21 +00:00
|
|
|
|
static void tsetattr(int *, int);
|
2015-05-05 20:13:21 +00:00
|
|
|
|
static void tsetchar(Rune, Glyph *, int, int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void tsetscroll(int, int);
|
2010-08-30 14:48:18 +00:00
|
|
|
|
static void tswapscreen(void);
|
2012-02-27 11:44:02 +00:00
|
|
|
|
static void tsetdirt(int, int);
|
2013-04-26 16:41:54 +00:00
|
|
|
|
static void tsetdirtattr(int);
|
2015-07-08 21:56:55 +00:00
|
|
|
|
static void tsetmode(int, int, int *, int);
|
2011-10-20 21:20:59 +00:00
|
|
|
|
static void tfulldirt(void);
|
2015-05-05 20:13:21 +00:00
|
|
|
|
static void techo(Rune);
|
2014-04-29 07:58:55 +00:00
|
|
|
|
static void tcontrolcode(uchar );
|
2014-04-26 07:24:04 +00:00
|
|
|
|
static void tdectest(char );
|
2016-09-13 12:01:18 +00:00
|
|
|
|
static void tdefutf8(char);
|
2013-11-25 13:09:53 +00:00
|
|
|
|
static int32_t tdefcolor(int *, int *, int);
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
static void tdeftran(char);
|
2015-07-08 21:56:55 +00:00
|
|
|
|
static inline int match(uint, uint);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void ttynew(void);
|
2015-11-06 19:01:00 +00:00
|
|
|
|
static size_t ttyread(void);
|
2012-09-24 08:27:22 +00:00
|
|
|
|
static void ttyresize(void);
|
2013-10-05 09:49:35 +00:00
|
|
|
|
static void ttysend(char *, size_t);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static void ttywrite(const char *, size_t);
|
2015-04-08 23:16:57 +00:00
|
|
|
|
static void tstrsequence(uchar);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static inline uchar sixd_to_8bit(int);
|
|
|
|
|
static void wldraws(char *, Glyph, int, int, int, int);
|
|
|
|
|
static void wldrawglyph(Glyph, int, int);
|
|
|
|
|
static void wlclear(int, int, int, int);
|
|
|
|
|
static void wldrawcursor(void);
|
|
|
|
|
static void wlinit(void);
|
|
|
|
|
static void wlloadcols(void);
|
|
|
|
|
static int wlsetcolorname(int, const char *);
|
|
|
|
|
static void wlloadcursor(void);
|
|
|
|
|
static int wlloadfont(Font *, FcPattern *);
|
|
|
|
|
static void wlloadfonts(char *, double);
|
|
|
|
|
static void wlsettitle(char *);
|
|
|
|
|
static void wlresettitle(void);
|
|
|
|
|
static void wlseturgency(int);
|
|
|
|
|
static void wlsetsel(char*, uint32_t);
|
|
|
|
|
static void wlunloadfont(Font *f);
|
|
|
|
|
static void wlunloadfonts(void);
|
|
|
|
|
static void wlresize(int, int);
|
|
|
|
|
|
|
|
|
|
static void regglobal(void *, struct wl_registry *, uint32_t, const char *,
|
|
|
|
|
uint32_t);
|
|
|
|
|
static void regglobalremove(void *, struct wl_registry *, uint32_t);
|
|
|
|
|
static void surfenter(void *, struct wl_surface *, struct wl_output *);
|
|
|
|
|
static void surfleave(void *, struct wl_surface *, struct wl_output *);
|
|
|
|
|
static void framedone(void *, struct wl_callback *, uint32_t);
|
|
|
|
|
static void kbdkeymap(void *, struct wl_keyboard *, uint32_t, int32_t, uint32_t);
|
|
|
|
|
static void kbdenter(void *, struct wl_keyboard *, uint32_t,
|
|
|
|
|
struct wl_surface *, struct wl_array *);
|
|
|
|
|
static void kbdleave(void *, struct wl_keyboard *, uint32_t,
|
|
|
|
|
struct wl_surface *);
|
|
|
|
|
static void kbdkey(void *, struct wl_keyboard *, uint32_t, uint32_t, uint32_t,
|
|
|
|
|
uint32_t);
|
|
|
|
|
static void kbdmodifiers(void *, struct wl_keyboard *, uint32_t, uint32_t,
|
|
|
|
|
uint32_t, uint32_t, uint32_t);
|
|
|
|
|
static void kbdrepeatinfo(void *, struct wl_keyboard *, int32_t, int32_t);
|
|
|
|
|
static void ptrenter(void *, struct wl_pointer *, uint32_t, struct wl_surface *,
|
|
|
|
|
wl_fixed_t, wl_fixed_t);
|
|
|
|
|
static void ptrleave(void *, struct wl_pointer *, uint32_t,
|
|
|
|
|
struct wl_surface *);
|
|
|
|
|
static void ptrmotion(void *, struct wl_pointer *, uint32_t,
|
|
|
|
|
wl_fixed_t, wl_fixed_t);
|
|
|
|
|
static void ptrbutton(void *, struct wl_pointer *, uint32_t, uint32_t,
|
|
|
|
|
uint32_t, uint32_t);
|
|
|
|
|
static void ptraxis(void *, struct wl_pointer *, uint32_t, uint32_t,
|
|
|
|
|
wl_fixed_t);
|
2017-01-25 22:10:56 +00:00
|
|
|
|
static void xdgshellping(void *, struct zxdg_shell_v6 *, uint32_t);
|
|
|
|
|
static void xdgsurfconfigure(void *, struct zxdg_surface_v6 *,
|
|
|
|
|
uint32_t);
|
|
|
|
|
static void xdgtoplevelconfigure(void *, struct zxdg_toplevel_v6 *,
|
|
|
|
|
int32_t, int32_t, struct wl_array *);
|
|
|
|
|
static void xdgtoplevelclose(void *, struct zxdg_toplevel_v6 *);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static void datadevoffer(void *, struct wl_data_device *,
|
|
|
|
|
struct wl_data_offer *);
|
|
|
|
|
static void datadeventer(void *, struct wl_data_device *, uint32_t,
|
|
|
|
|
struct wl_surface *, wl_fixed_t, wl_fixed_t, struct wl_data_offer *);
|
|
|
|
|
static void datadevleave(void *, struct wl_data_device *);
|
|
|
|
|
static void datadevmotion(void *, struct wl_data_device *, uint32_t,
|
|
|
|
|
wl_fixed_t x, wl_fixed_t y);
|
|
|
|
|
static void datadevdrop(void *, struct wl_data_device *);
|
|
|
|
|
static void datadevselection(void *, struct wl_data_device *,
|
|
|
|
|
struct wl_data_offer *);
|
|
|
|
|
static void dataofferoffer(void *, struct wl_data_offer *, const char *);
|
|
|
|
|
static void datasrctarget(void *, struct wl_data_source *, const char *);
|
|
|
|
|
static void datasrcsend(void *, struct wl_data_source *, const char *, int32_t);
|
|
|
|
|
static void datasrccancelled(void *, struct wl_data_source *);
|
2010-11-18 11:43:33 +00:00
|
|
|
|
|
|
|
|
|
static void selinit(void);
|
2014-06-03 02:34:58 +00:00
|
|
|
|
static void selnormalize(void);
|
2015-07-08 21:56:55 +00:00
|
|
|
|
static inline int selected(int, int);
|
2014-02-01 12:41:58 +00:00
|
|
|
|
static char *getsel(void);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static void selcopy(uint32_t);
|
2011-09-16 16:48:16 +00:00
|
|
|
|
static void selscroll(int, int);
|
2015-04-30 20:51:35 +00:00
|
|
|
|
static void selsnap(int *, int *, int);
|
2015-04-08 23:17:33 +00:00
|
|
|
|
static int x2col(int);
|
|
|
|
|
static int y2row(int);
|
2009-07-10 15:23:11 +00:00
|
|
|
|
|
2015-05-05 20:13:21 +00:00
|
|
|
|
static size_t utf8decode(char *, Rune *, size_t);
|
|
|
|
|
static Rune utf8decodebyte(char, size_t *);
|
|
|
|
|
static size_t utf8encode(Rune, char *);
|
|
|
|
|
static char utf8encodebyte(Rune, size_t);
|
2015-05-22 14:06:57 +00:00
|
|
|
|
static char *utf8strchr(char *s, Rune u);
|
2015-05-05 20:13:21 +00:00
|
|
|
|
static size_t utf8validate(Rune *, size_t);
|
2010-11-18 00:00:04 +00:00
|
|
|
|
|
2014-04-25 14:27:26 +00:00
|
|
|
|
static ssize_t xwrite(int, const char *, size_t);
|
2012-09-12 19:25:35 +00:00
|
|
|
|
static void *xmalloc(size_t);
|
|
|
|
|
static void *xrealloc(void *, size_t);
|
2014-04-22 17:59:21 +00:00
|
|
|
|
static char *xstrdup(char *);
|
2012-09-12 19:25:35 +00:00
|
|
|
|
|
2014-04-27 11:39:47 +00:00
|
|
|
|
static void usage(void);
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static struct wl_registry_listener reglistener = { regglobal, regglobalremove };
|
|
|
|
|
static struct wl_surface_listener surflistener = { surfenter, surfleave };
|
|
|
|
|
static struct wl_callback_listener framelistener = { framedone };
|
|
|
|
|
static struct wl_keyboard_listener kbdlistener =
|
|
|
|
|
{ kbdkeymap, kbdenter, kbdleave, kbdkey, kbdmodifiers, kbdrepeatinfo };
|
|
|
|
|
static struct wl_pointer_listener ptrlistener =
|
|
|
|
|
{ ptrenter, ptrleave, ptrmotion, ptrbutton, ptraxis };
|
2017-01-25 22:10:56 +00:00
|
|
|
|
static struct zxdg_shell_v6_listener xdgshelllistener = { xdgshellping };
|
|
|
|
|
static struct zxdg_surface_v6_listener xdgsurflistener =
|
|
|
|
|
{ xdgsurfconfigure };
|
|
|
|
|
static struct zxdg_toplevel_v6_listener xdgtoplevellistener =
|
|
|
|
|
{ xdgtoplevelconfigure, xdgtoplevelclose };
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static struct wl_data_device_listener datadevlistener =
|
|
|
|
|
{ datadevoffer, datadeventer, datadevleave, datadevmotion, datadevdrop,
|
|
|
|
|
datadevselection };
|
|
|
|
|
static struct wl_data_offer_listener dataofferlistener = { dataofferoffer };
|
|
|
|
|
static struct wl_data_source_listener datasrclistener =
|
|
|
|
|
{ datasrctarget, datasrcsend, datasrccancelled };
|
2009-06-16 00:23:46 +00:00
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
/* Globals */
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static DC dc;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static Wayland wl;
|
|
|
|
|
static WLD wld;
|
|
|
|
|
static Cursor cursor;
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static Term term;
|
2012-08-29 21:14:20 +00:00
|
|
|
|
static CSIEscape csiescseq;
|
|
|
|
|
static STREscape strescseq;
|
2009-07-10 15:23:11 +00:00
|
|
|
|
static int cmdfd;
|
|
|
|
|
static pid_t pid;
|
2010-08-31 13:36:13 +00:00
|
|
|
|
static Selection sel;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static Repeat repeat;
|
|
|
|
|
static bool needdraw = true;
|
2015-07-08 21:49:25 +00:00
|
|
|
|
static int iofd = 1;
|
2016-01-29 21:03:01 +00:00
|
|
|
|
static char **opt_cmd = NULL;
|
2010-11-19 16:13:13 +00:00
|
|
|
|
static char *opt_class = NULL;
|
2016-01-29 21:03:01 +00:00
|
|
|
|
static char *opt_embed = NULL;
|
|
|
|
|
static char *opt_font = NULL;
|
|
|
|
|
static char *opt_io = NULL;
|
|
|
|
|
static char *opt_line = NULL;
|
|
|
|
|
static char *opt_name = NULL;
|
|
|
|
|
static char *opt_title = NULL;
|
|
|
|
|
static int oldbutton = 3; /* button event on startup: 3 = release */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static int oldx, oldy;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
static char *usedfont = NULL;
|
2013-12-17 20:14:19 +00:00
|
|
|
|
static double usedfontsize = 0;
|
2014-09-29 13:38:21 +00:00
|
|
|
|
static double defaultfontsize = 0;
|
2012-10-28 05:27:42 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
|
|
|
|
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
2015-05-05 20:13:21 +00:00
|
|
|
|
static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
|
|
|
|
static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
2014-03-25 19:20:26 +00:00
|
|
|
|
|
2012-12-28 22:52:04 +00:00
|
|
|
|
/* Font Ring Cache */
|
|
|
|
|
enum {
|
|
|
|
|
FRC_NORMAL,
|
|
|
|
|
FRC_ITALIC,
|
|
|
|
|
FRC_BOLD,
|
|
|
|
|
FRC_ITALICBOLD
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct wld_font *font;
|
2012-12-28 22:52:04 +00:00
|
|
|
|
int flags;
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune unicodep;
|
2012-12-28 22:52:04 +00:00
|
|
|
|
} Fontcache;
|
|
|
|
|
|
Improved font caching
I made a patch that improves the performance of font caching mechanism.
This is based on a funny behaviour of FontConfig: it was handling
FcCharSet in a somewhat unexpected way.
So, we are currently adding "a character" to a new FcCharSet, and then
add it to a FcPattern. However, if we toss the FcPattern to FontConfig,
it loads the entire language(charset) that contains the character we
gave. That is, we don't always have to load a new font for each unknown
character. Instead, we can reused cached fonts, and this significantly
reduces the number of calls to extremely slow FontConfig matching
functions.
One more thing. I found that, in libXft, there's a function called
XftCharExists. XftCharIndex internally calls this function, and
does more stuffs if the character does exist. Since the returned index
is never used in st, we should call XftCharExists instead of
XftCharIndex. Please note that I already made this change in the patch.
2013-07-19 05:07:02 +00:00
|
|
|
|
/* Fontcache is an array now. A new font will be appended to the array. */
|
|
|
|
|
static Fontcache frc[16];
|
|
|
|
|
static int frclen = 0;
|
2012-12-28 22:52:04 +00:00
|
|
|
|
|
2012-10-28 05:27:42 +00:00
|
|
|
|
ssize_t
|
2015-07-09 21:59:50 +00:00
|
|
|
|
xwrite(int fd, const char *s, size_t len)
|
|
|
|
|
{
|
2015-07-24 09:52:17 +00:00
|
|
|
|
size_t aux = len;
|
|
|
|
|
ssize_t r;
|
2012-10-28 05:27:42 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (len > 0) {
|
2015-07-10 12:19:31 +00:00
|
|
|
|
r = write(fd, s, len);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (r < 0)
|
2012-10-28 05:27:42 +00:00
|
|
|
|
return r;
|
|
|
|
|
len -= r;
|
|
|
|
|
s += r;
|
|
|
|
|
}
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2012-10-28 05:27:42 +00:00
|
|
|
|
return aux;
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-12 19:25:35 +00:00
|
|
|
|
void *
|
2015-07-09 21:59:50 +00:00
|
|
|
|
xmalloc(size_t len)
|
|
|
|
|
{
|
2012-09-12 19:25:35 +00:00
|
|
|
|
void *p = malloc(len);
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!p)
|
2012-09-17 20:11:28 +00:00
|
|
|
|
die("Out of memory\n");
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2012-09-12 19:25:35 +00:00
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void *
|
2015-07-09 21:59:50 +00:00
|
|
|
|
xrealloc(void *p, size_t len)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((p = realloc(p, len)) == NULL)
|
2012-09-17 20:11:28 +00:00
|
|
|
|
die("Out of memory\n");
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2012-09-12 19:25:35 +00:00
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-01 10:12:47 +00:00
|
|
|
|
char *
|
2015-07-09 21:59:50 +00:00
|
|
|
|
xstrdup(char *s)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((s = strdup(s)) == NULL)
|
2014-02-01 10:12:47 +00:00
|
|
|
|
die("Out of memory\n");
|
|
|
|
|
|
2014-04-22 17:59:48 +00:00
|
|
|
|
return s;
|
2014-02-01 10:12:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
size_t
|
2015-07-09 21:59:50 +00:00
|
|
|
|
utf8decode(char *c, Rune *u, size_t clen)
|
|
|
|
|
{
|
2014-03-25 19:20:26 +00:00
|
|
|
|
size_t i, j, len, type;
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune udecoded;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
*u = UTF_INVALID;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!clen)
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return 0;
|
|
|
|
|
udecoded = utf8decodebyte(c[0], &len);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!BETWEEN(len, 1, UTF_SIZ))
|
2010-11-18 00:00:04 +00:00
|
|
|
|
return 1;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
2014-03-25 19:20:26 +00:00
|
|
|
|
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (type != 0)
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return j;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (j < len)
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return 0;
|
|
|
|
|
*u = udecoded;
|
|
|
|
|
utf8validate(u, len);
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return len;
|
|
|
|
|
}
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune
|
2015-07-09 21:59:50 +00:00
|
|
|
|
utf8decodebyte(char c, size_t *i)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (*i = 0; *i < LEN(utfmask); ++(*i))
|
|
|
|
|
if (((uchar)c & utfmask[*i]) == utfbyte[*i])
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return (uchar)c & ~utfmask[*i];
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return 0;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
size_t
|
2015-07-09 21:59:50 +00:00
|
|
|
|
utf8encode(Rune u, char *c)
|
|
|
|
|
{
|
2014-03-25 19:20:26 +00:00
|
|
|
|
size_t len, i;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
len = utf8validate(&u, 0);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (len > UTF_SIZ)
|
2010-11-18 00:00:04 +00:00
|
|
|
|
return 0;
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = len - 1; i != 0; --i) {
|
2014-03-25 19:20:26 +00:00
|
|
|
|
c[i] = utf8encodebyte(u, 0);
|
|
|
|
|
u >>= 6;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
}
|
2014-03-25 19:20:26 +00:00
|
|
|
|
c[0] = utf8encodebyte(u, len);
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return len;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
char
|
2015-07-09 21:59:50 +00:00
|
|
|
|
utf8encodebyte(Rune u, size_t i)
|
|
|
|
|
{
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return utfbyte[i] | (u & ~utfmask[i]);
|
|
|
|
|
}
|
2010-11-18 00:00:04 +00:00
|
|
|
|
|
2015-05-22 14:06:57 +00:00
|
|
|
|
char *
|
2015-07-09 21:59:50 +00:00
|
|
|
|
utf8strchr(char *s, Rune u)
|
|
|
|
|
{
|
2015-05-22 14:06:57 +00:00
|
|
|
|
Rune r;
|
|
|
|
|
size_t i, j, len;
|
|
|
|
|
|
|
|
|
|
len = strlen(s);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0, j = 0; i < len; i += j) {
|
|
|
|
|
if (!(j = utf8decode(&s[i], &r, len - i)))
|
2015-05-22 14:06:57 +00:00
|
|
|
|
break;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (r == u)
|
2015-05-22 14:06:57 +00:00
|
|
|
|
return &(s[i]);
|
|
|
|
|
}
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2015-05-22 14:06:57 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
size_t
|
2015-07-09 21:59:50 +00:00
|
|
|
|
utf8validate(Rune *u, size_t i)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
|
2014-03-25 19:20:26 +00:00
|
|
|
|
*u = UTF_INVALID;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 1; *u > utfmax[i]; ++i)
|
2014-03-25 19:20:26 +00:00
|
|
|
|
;
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2014-03-25 19:20:26 +00:00
|
|
|
|
return i;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-04-08 23:17:33 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
selinit(void)
|
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
sel.tclick1 = 0;
|
|
|
|
|
sel.tclick2 = 0;
|
2015-05-01 17:13:13 +00:00
|
|
|
|
sel.mode = SEL_IDLE;
|
2015-10-11 09:44:34 +00:00
|
|
|
|
sel.snap = 0;
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.ob.x = -1;
|
2015-03-14 06:41:59 +00:00
|
|
|
|
sel.primary = NULL;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
sel.source = NULL;
|
2010-08-31 14:53:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-04-08 23:17:33 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
x2col(int x)
|
|
|
|
|
{
|
2012-11-03 02:24:22 +00:00
|
|
|
|
x -= borderpx;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
x /= wl.cw;
|
2012-11-03 02:24:22 +00:00
|
|
|
|
|
|
|
|
|
return LIMIT(x, 0, term.col-1);
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-08 23:17:33 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
y2row(int y)
|
|
|
|
|
{
|
2012-11-03 02:24:22 +00:00
|
|
|
|
y -= borderpx;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
y /= wl.ch;
|
2012-11-03 02:24:22 +00:00
|
|
|
|
|
|
|
|
|
return LIMIT(y, 0, term.row-1);
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-18 16:45:21 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tlinelen(int y)
|
|
|
|
|
{
|
2014-06-03 02:34:58 +00:00
|
|
|
|
int i = term.col;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.line[y][i - 1].mode & ATTR_WRAP)
|
2014-08-22 16:25:04 +00:00
|
|
|
|
return i;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (i > 0 && term.line[y][i - 1].u == ' ')
|
2014-06-03 02:34:58 +00:00
|
|
|
|
--i;
|
|
|
|
|
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-08 23:17:33 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
selnormalize(void)
|
|
|
|
|
{
|
2014-06-03 02:34:58 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
|
2013-05-26 14:10:22 +00:00
|
|
|
|
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;
|
2015-04-30 19:59:24 +00:00
|
|
|
|
} else {
|
|
|
|
|
sel.nb.x = MIN(sel.ob.x, sel.oe.x);
|
|
|
|
|
sel.ne.x = MAX(sel.ob.x, sel.oe.x);
|
2013-05-26 14:10:22 +00:00
|
|
|
|
}
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.nb.y = MIN(sel.ob.y, sel.oe.y);
|
|
|
|
|
sel.ne.y = MAX(sel.ob.y, sel.oe.y);
|
2014-06-03 02:34:58 +00:00
|
|
|
|
|
2015-04-30 20:51:35 +00:00
|
|
|
|
selsnap(&sel.nb.x, &sel.nb.y, -1);
|
|
|
|
|
selsnap(&sel.ne.x, &sel.ne.y, +1);
|
2014-08-20 19:14:08 +00:00
|
|
|
|
|
2014-06-03 02:34:58 +00:00
|
|
|
|
/* expand selection over line breaks */
|
|
|
|
|
if (sel.type == SEL_RECTANGULAR)
|
|
|
|
|
return;
|
|
|
|
|
i = tlinelen(sel.nb.y);
|
|
|
|
|
if (i < sel.nb.x)
|
|
|
|
|
sel.nb.x = i;
|
|
|
|
|
if (tlinelen(sel.ne.y) <= sel.ne.x)
|
|
|
|
|
sel.ne.x = term.col - 1;
|
2013-05-26 11:07:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
selected(int x, int y)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.mode == SEL_EMPTY)
|
2015-07-08 21:56:55 +00:00
|
|
|
|
return 0;
|
2015-05-03 19:28:10 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.type == SEL_RECTANGULAR)
|
2014-04-27 11:16:41 +00:00
|
|
|
|
return BETWEEN(y, sel.nb.y, sel.ne.y)
|
|
|
|
|
&& BETWEEN(x, sel.nb.x, sel.ne.x);
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2014-04-27 11:16:41 +00:00
|
|
|
|
return BETWEEN(y, sel.nb.y, sel.ne.y)
|
|
|
|
|
&& (y != sel.nb.y || x >= sel.nb.x)
|
|
|
|
|
&& (y != sel.ne.y || x <= sel.ne.x);
|
2010-08-30 21:41:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-04-15 06:28:31 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
selsnap(int *x, int *y, int direction)
|
|
|
|
|
{
|
2014-06-05 04:32:01 +00:00
|
|
|
|
int newx, newy, xt, yt;
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int delim, prevdelim;
|
2014-08-20 19:20:44 +00:00
|
|
|
|
Glyph *gp, *prevgp;
|
2014-06-05 04:32:01 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (sel.snap) {
|
2013-04-15 06:28:31 +00:00
|
|
|
|
case SNAP_WORD:
|
2013-05-04 06:01:17 +00:00
|
|
|
|
/*
|
|
|
|
|
* Snap around if the word wraps around at the end or
|
|
|
|
|
* beginning of a line.
|
|
|
|
|
*/
|
2014-08-20 19:20:44 +00:00
|
|
|
|
prevgp = &term.line[*y][*x];
|
2015-04-21 21:29:01 +00:00
|
|
|
|
prevdelim = ISDELIM(prevgp->u);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (;;) {
|
2014-06-05 04:32:01 +00:00
|
|
|
|
newx = *x + direction;
|
|
|
|
|
newy = *y;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!BETWEEN(newx, 0, term.col - 1)) {
|
2014-06-05 04:32:01 +00:00
|
|
|
|
newy += direction;
|
|
|
|
|
newx = (newx + term.col) % term.col;
|
|
|
|
|
if (!BETWEEN(newy, 0, term.row - 1))
|
2013-04-28 16:14:15 +00:00
|
|
|
|
break;
|
2014-06-05 04:32:01 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (direction > 0)
|
2014-06-05 04:32:01 +00:00
|
|
|
|
yt = *y, xt = *x;
|
|
|
|
|
else
|
|
|
|
|
yt = newy, xt = newx;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
2013-04-28 16:14:15 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-05 04:32:01 +00:00
|
|
|
|
if (newx >= tlinelen(newy))
|
|
|
|
|
break;
|
2013-09-07 10:41:36 +00:00
|
|
|
|
|
2014-06-05 04:32:01 +00:00
|
|
|
|
gp = &term.line[newy][newx];
|
2015-04-21 21:29:01 +00:00
|
|
|
|
delim = ISDELIM(gp->u);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
2015-04-21 21:29:01 +00:00
|
|
|
|
|| (delim && gp->u != prevgp->u)))
|
2013-04-28 16:14:15 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2014-06-05 04:32:01 +00:00
|
|
|
|
*x = newx;
|
|
|
|
|
*y = newy;
|
2014-08-20 19:20:44 +00:00
|
|
|
|
prevgp = gp;
|
|
|
|
|
prevdelim = delim;
|
2013-04-15 06:28:31 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case SNAP_LINE:
|
2013-05-04 06:01:17 +00:00
|
|
|
|
/*
|
|
|
|
|
* Snap around if the the previous line or the current one
|
|
|
|
|
* has set ATTR_WRAP at its end. Then the whole next or
|
|
|
|
|
* previous line will be selected.
|
|
|
|
|
*/
|
2013-04-15 06:28:31 +00:00
|
|
|
|
*x = (direction < 0) ? 0 : term.col - 1;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (direction < 0) {
|
|
|
|
|
for (; *y > 0; *y += direction) {
|
|
|
|
|
if (!(term.line[*y-1][term.col-1].mode
|
2013-04-28 16:14:15 +00:00
|
|
|
|
& ATTR_WRAP)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (direction > 0) {
|
|
|
|
|
for (; *y < term.row-1; *y += direction) {
|
|
|
|
|
if (!(term.line[*y][term.col-1].mode
|
2013-04-28 16:14:15 +00:00
|
|
|
|
& ATTR_WRAP)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-04-15 06:28:31 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-20 21:24:04 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
getbuttoninfo(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2013-02-19 18:08:41 +00:00
|
|
|
|
int type;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint state = wl.xkb.mods & ~forceselmod;
|
2013-02-19 18:08:41 +00:00
|
|
|
|
|
2012-12-10 19:45:46 +00:00
|
|
|
|
sel.alt = IS_SET(MODE_ALTSCREEN);
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
sel.oe.x = x2col(wl.px);
|
|
|
|
|
sel.oe.y = y2row(wl.py);
|
2014-06-03 02:34:58 +00:00
|
|
|
|
selnormalize();
|
2013-02-19 18:08:41 +00:00
|
|
|
|
|
|
|
|
|
sel.type = SEL_REGULAR;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (type = 1; type < LEN(selmasks); ++type) {
|
|
|
|
|
if (match(selmasks[type], state)) {
|
2013-02-19 18:08:41 +00:00
|
|
|
|
sel.type = type;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-08-30 21:41:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-05-10 20:22:44 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlmousereport(int button, bool release, int x, int y)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int len;
|
2013-01-26 14:13:56 +00:00
|
|
|
|
char buf[40];
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!IS_SET(MODE_MOUSEX10)) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
button += ((wl.xkb.mods & MOD_MASK_SHIFT) ? 4 : 0)
|
|
|
|
|
+ ((wl.xkb.mods & MOD_MASK_LOGO ) ? 8 : 0)
|
|
|
|
|
+ ((wl.xkb.mods & MOD_MASK_CTRL ) ? 16 : 0);
|
2013-06-01 12:37:30 +00:00
|
|
|
|
}
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_MOUSESGR)) {
|
2013-01-26 14:13:56 +00:00
|
|
|
|
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
|
2016-10-31 06:54:56 +00:00
|
|
|
|
button, x+1, y+1, release ? 'm' : 'M');
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (x < 223 && y < 223) {
|
2013-01-26 14:13:56 +00:00
|
|
|
|
len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
|
Fix some bugs in mouse tracking logic
* Button number in X10 mode:
I believe the button - 1 came from "C b is button - 1" from [0].
However, above this section, it states
"Normally, parameters (such as pointer poisition and button number)
for all mouse tracking escape sequences generated by xterm encode
numeric parameters in a single character as value+32. For example, !
specifies the value 1."
Also, from the description of SGR,
"The encoded button value in this case does not add 32 since that
was useful only in the X10 scheme for ensuring that the byte
containing the button value is a printable code."
This suggests that we should still add 32 to the button value when in
MODE_MOUSEX10.
* No button release reporting in X10 mode:
"X10 compatibility mode sends an escape sequence only on button press,
encoding the location and the mouse button pressed."
* Fix MODE_MOUSEMOTION:
Currently, motion reporting is skipped when oldbutton == 3
(corresponding to no button being pressed). However, oldbutton is
only set on a button press, which will never be 3.
[0]: http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
2013-07-25 23:19:19 +00:00
|
|
|
|
32+button, 32+x+1, 32+y+1);
|
2013-01-26 14:13:56 +00:00
|
|
|
|
} else {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ttywrite(buf, len);
|
2011-05-10 20:22:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-11-20 21:24:04 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlmousereportbutton(uint32_t button, uint32_t state)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
bool release = state == WL_POINTER_BUTTON_STATE_RELEASED;
|
2013-04-15 06:28:31 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!IS_SET(MODE_MOUSESGR) && release) {
|
|
|
|
|
button = 3;
|
|
|
|
|
} else {
|
|
|
|
|
switch (button) {
|
|
|
|
|
case BTN_LEFT:
|
|
|
|
|
button = 0;
|
|
|
|
|
break;
|
|
|
|
|
case BTN_MIDDLE:
|
|
|
|
|
button = 1;
|
|
|
|
|
break;
|
|
|
|
|
case BTN_RIGHT:
|
|
|
|
|
button = 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2013-04-28 15:42:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
oldbutton = release ? 3 : button;
|
|
|
|
|
|
|
|
|
|
/* don't report release events when in X10 mode */
|
|
|
|
|
if (IS_SET(MODE_MOUSEX10) && release) {
|
|
|
|
|
return;
|
2013-04-28 15:42:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlmousereport(button, release, oldx, oldy);
|
|
|
|
|
}
|
2013-04-21 11:01:16 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
void
|
|
|
|
|
wlmousereportmotion(wl_fixed_t fx, wl_fixed_t fy)
|
|
|
|
|
{
|
|
|
|
|
int x = x2col(wl_fixed_to_int(fx)), y = y2row(wl_fixed_to_int(fy));
|
2013-04-21 11:01:16 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (x == oldx && y == oldy)
|
|
|
|
|
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;
|
2013-04-21 11:01:16 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
oldx = x;
|
|
|
|
|
oldy = y;
|
|
|
|
|
wlmousereport(oldbutton + 32, false, x, y);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
wlmousereportaxis(uint32_t axis, wl_fixed_t amount)
|
|
|
|
|
{
|
|
|
|
|
wlmousereport(64 + (axis == AXIS_VERTICAL ? 4 : 6)
|
|
|
|
|
+ (amount > 0 ? 1 : 0), false, oldx, oldy);
|
2010-08-30 21:41:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-01 12:41:58 +00:00
|
|
|
|
char *
|
2015-07-09 21:59:50 +00:00
|
|
|
|
getsel(void)
|
|
|
|
|
{
|
2013-04-15 13:13:19 +00:00
|
|
|
|
char *str, *ptr;
|
2015-04-21 21:29:01 +00:00
|
|
|
|
int y, bufsize, lastx, linelen;
|
2012-10-28 12:35:00 +00:00
|
|
|
|
Glyph *gp, *last;
|
2010-11-18 11:43:33 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.ob.x == -1)
|
2014-04-27 11:40:23 +00:00
|
|
|
|
return NULL;
|
2012-02-27 11:44:02 +00:00
|
|
|
|
|
2014-04-27 11:40:23 +00:00
|
|
|
|
bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
|
|
|
|
|
ptr = str = xmalloc(bufsize);
|
2012-09-17 20:13:09 +00:00
|
|
|
|
|
2014-04-27 11:40:23 +00:00
|
|
|
|
/* append every set & selected glyph to the selection */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (y = sel.nb.y; y <= sel.ne.y; y++) {
|
2015-09-10 09:53:11 +00:00
|
|
|
|
if ((linelen = tlinelen(y)) == 0) {
|
|
|
|
|
*ptr++ = '\n';
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2012-10-28 12:35:00 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.type == SEL_RECTANGULAR) {
|
2014-06-27 07:15:56 +00:00
|
|
|
|
gp = &term.line[y][sel.nb.x];
|
|
|
|
|
lastx = sel.ne.x;
|
|
|
|
|
} else {
|
|
|
|
|
gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
|
|
|
|
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
2014-04-27 11:40:23 +00:00
|
|
|
|
}
|
2014-06-27 07:15:56 +00:00
|
|
|
|
last = &term.line[y][MIN(lastx, linelen-1)];
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (last >= gp && last->u == ' ')
|
2014-11-16 08:02:57 +00:00
|
|
|
|
--last;
|
2012-10-28 12:35:00 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for ( ; gp <= last; ++gp) {
|
|
|
|
|
if (gp->mode & ATTR_WDUMMY)
|
2014-04-27 11:40:23 +00:00
|
|
|
|
continue;
|
2013-04-13 06:48:17 +00:00
|
|
|
|
|
2015-04-21 21:29:01 +00:00
|
|
|
|
ptr += utf8encode(gp->u, ptr);
|
2014-04-27 11:40:23 +00:00
|
|
|
|
}
|
2013-05-04 17:00:32 +00:00
|
|
|
|
|
2014-04-27 11:40:23 +00:00
|
|
|
|
/*
|
|
|
|
|
* Copy and pasting of line endings is inconsistent
|
|
|
|
|
* in the inconsistent terminal and GUI world.
|
|
|
|
|
* The best solution seems like to produce '\n' when
|
|
|
|
|
* something is copied from st and convert '\n' to
|
|
|
|
|
* '\r', when something to be pasted is received by
|
|
|
|
|
* st.
|
|
|
|
|
* FIXME: Fix the computer world.
|
|
|
|
|
*/
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
|
2014-04-27 11:40:23 +00:00
|
|
|
|
*ptr++ = '\n';
|
2010-08-30 21:41:37 +00:00
|
|
|
|
}
|
2014-04-27 11:40:23 +00:00
|
|
|
|
*ptr = 0;
|
2014-02-01 12:41:58 +00:00
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selcopy(uint32_t serial)
|
2015-07-10 12:10:17 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsetsel(getsel(), serial);
|
2015-07-10 12:10:17 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static inline void
|
|
|
|
|
selwritebuf(char *buf, int len)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
char *repl = buf;
|
2015-07-10 12:10:17 +00:00
|
|
|
|
|
|
|
|
|
/*
|
2016-10-31 06:54:56 +00:00
|
|
|
|
* As seen in getsel:
|
|
|
|
|
* Line endings are inconsistent in the terminal and GUI world
|
|
|
|
|
* copy and pasting. When receiving some selection data,
|
|
|
|
|
* replace all '\n' with '\r'.
|
|
|
|
|
* FIXME: Fix the computer world.
|
2015-07-10 12:10:17 +00:00
|
|
|
|
*/
|
2016-10-31 06:54:56 +00:00
|
|
|
|
while ((repl = memchr(repl, '\n', len))) {
|
|
|
|
|
*repl++ = '\r';
|
|
|
|
|
}
|
2010-10-12 23:24:11 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
ttysend(buf, len);
|
2010-10-12 23:24:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-14 06:41:59 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selpaste(const Arg *dummy)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int fds[2], len, left;
|
|
|
|
|
char buf[BUFSIZ], *str;
|
2015-03-14 06:41:59 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (wl.seloffer) {
|
|
|
|
|
if (IS_SET(MODE_BRCKTPASTE))
|
|
|
|
|
ttywrite("\033[200~", 6);
|
|
|
|
|
/* check if we are pasting from ourselves */
|
|
|
|
|
if (sel.source) {
|
|
|
|
|
str = sel.primary;
|
|
|
|
|
left = strlen(sel.primary);
|
|
|
|
|
while (left > 0) {
|
|
|
|
|
len = MIN(sizeof buf, left);
|
|
|
|
|
memcpy(buf, str, len);
|
|
|
|
|
selwritebuf(buf, len);
|
|
|
|
|
left -= len;
|
|
|
|
|
str += len;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
pipe(fds);
|
|
|
|
|
wl_data_offer_receive(wl.seloffer, "text/plain", fds[1]);
|
|
|
|
|
wl_display_flush(wl.dpy);
|
|
|
|
|
close(fds[1]);
|
|
|
|
|
while ((len = read(fds[0], buf, sizeof buf)) > 0) {
|
|
|
|
|
selwritebuf(buf, len);
|
|
|
|
|
}
|
|
|
|
|
close(fds[0]);
|
|
|
|
|
}
|
|
|
|
|
if (IS_SET(MODE_BRCKTPASTE))
|
|
|
|
|
ttywrite("\033[201~", 6);
|
2015-03-14 06:41:59 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-23 20:50:13 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selclear(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.ob.x == -1)
|
2012-09-05 19:55:45 +00:00
|
|
|
|
return;
|
2015-05-14 13:46:07 +00:00
|
|
|
|
sel.mode = SEL_IDLE;
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.ob.x = -1;
|
|
|
|
|
tsetdirt(sel.nb.y, sel.ne.y);
|
2012-09-05 19:55:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-11-20 21:24:04 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsetsel(char *str, uint32_t serial)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2015-03-14 06:41:59 +00:00
|
|
|
|
free(sel.primary);
|
|
|
|
|
sel.primary = str;
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (str) {
|
|
|
|
|
sel.source = wl_data_device_manager_create_data_source(wl.datadevmanager);
|
|
|
|
|
wl_data_source_add_listener(sel.source, &datasrclistener, NULL);
|
|
|
|
|
wl_data_source_offer(sel.source, "text/plain; charset=utf-8");
|
|
|
|
|
} else {
|
|
|
|
|
sel.source = NULL;
|
2011-06-08 17:32:10 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl_data_device_set_selection(wl.datadev, sel.source, serial);
|
2010-08-30 21:41:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
die(const char *errstr, ...)
|
|
|
|
|
{
|
2009-05-10 12:17:09 +00:00
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
|
|
va_start(ap, errstr);
|
|
|
|
|
vfprintf(stderr, errstr, ap);
|
|
|
|
|
va_end(ap);
|
2015-07-08 21:49:25 +00:00
|
|
|
|
exit(1);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
execsh(void)
|
|
|
|
|
{
|
2014-10-15 17:42:20 +00:00
|
|
|
|
char **args, *sh, *prog;
|
2014-08-18 22:55:02 +00:00
|
|
|
|
const struct passwd *pw;
|
2010-11-28 12:17:20 +00:00
|
|
|
|
|
2014-08-18 22:55:02 +00:00
|
|
|
|
errno = 0;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((pw = getpwuid(getuid())) == NULL) {
|
|
|
|
|
if (errno)
|
2014-08-18 22:55:02 +00:00
|
|
|
|
die("getpwuid:%s\n", strerror(errno));
|
|
|
|
|
else
|
|
|
|
|
die("who are you?\n");
|
|
|
|
|
}
|
2012-09-04 22:08:13 +00:00
|
|
|
|
|
2015-07-24 05:44:34 +00:00
|
|
|
|
if ((sh = getenv("SHELL")) == NULL)
|
2014-10-29 00:51:42 +00:00
|
|
|
|
sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (opt_cmd)
|
2014-10-15 17:42:20 +00:00
|
|
|
|
prog = opt_cmd[0];
|
2015-07-10 08:29:53 +00:00
|
|
|
|
else if (utmp)
|
2014-10-15 17:42:20 +00:00
|
|
|
|
prog = utmp;
|
2014-08-28 10:48:29 +00:00
|
|
|
|
else
|
2014-10-15 17:42:20 +00:00
|
|
|
|
prog = sh;
|
|
|
|
|
args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
|
|
|
|
|
|
2014-08-28 10:48:29 +00:00
|
|
|
|
unsetenv("COLUMNS");
|
|
|
|
|
unsetenv("LINES");
|
|
|
|
|
unsetenv("TERMCAP");
|
2014-08-18 22:55:02 +00:00
|
|
|
|
setenv("LOGNAME", pw->pw_name, 1);
|
|
|
|
|
setenv("USER", pw->pw_name, 1);
|
2014-10-15 17:42:20 +00:00
|
|
|
|
setenv("SHELL", sh, 1);
|
2014-08-18 22:55:02 +00:00
|
|
|
|
setenv("HOME", pw->pw_dir, 1);
|
|
|
|
|
setenv("TERM", termname, 1);
|
2012-10-28 05:54:08 +00:00
|
|
|
|
|
2012-09-13 21:19:57 +00:00
|
|
|
|
signal(SIGCHLD, SIG_DFL);
|
|
|
|
|
signal(SIGHUP, SIG_DFL);
|
|
|
|
|
signal(SIGINT, SIG_DFL);
|
|
|
|
|
signal(SIGQUIT, SIG_DFL);
|
|
|
|
|
signal(SIGTERM, SIG_DFL);
|
|
|
|
|
signal(SIGALRM, SIG_DFL);
|
|
|
|
|
|
2014-10-15 17:42:20 +00:00
|
|
|
|
execvp(prog, args);
|
2015-07-08 21:49:25 +00:00
|
|
|
|
_exit(1);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-04-26 18:29:28 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
sigchld(int a)
|
|
|
|
|
{
|
2015-07-08 21:49:25 +00:00
|
|
|
|
int stat;
|
2015-04-22 15:22:34 +00:00
|
|
|
|
pid_t p;
|
2012-10-05 20:59:08 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
|
2014-04-20 11:15:40 +00:00
|
|
|
|
die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
|
2012-10-05 20:59:08 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (pid != p)
|
2015-04-22 15:22:34 +00:00
|
|
|
|
return;
|
|
|
|
|
|
2015-07-08 21:49:25 +00:00
|
|
|
|
if (!WIFEXITED(stat) || WEXITSTATUS(stat))
|
2017-01-25 22:10:56 +00:00
|
|
|
|
die("child finished with error '%d'\n", WEXITSTATUS(stat));
|
2015-07-08 21:49:25 +00:00
|
|
|
|
exit(0);
|
2009-06-11 14:41:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-04-13 17:03:53 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
stty(void)
|
|
|
|
|
{
|
|
|
|
|
char cmd[_POSIX_ARG_MAX], **p, *q, *s;
|
|
|
|
|
size_t n, siz;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((n = strlen(stty_args)) > sizeof(cmd)-1)
|
2015-04-13 17:03:53 +00:00
|
|
|
|
die("incorrect stty parameters\n");
|
|
|
|
|
memcpy(cmd, stty_args, n);
|
|
|
|
|
q = cmd + n;
|
|
|
|
|
siz = sizeof(cmd) - n;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (p = opt_cmd; p && (s = *p); ++p) {
|
|
|
|
|
if ((n = strlen(s)) > siz-1)
|
2015-04-13 17:03:53 +00:00
|
|
|
|
die("stty parameter length too long\n");
|
|
|
|
|
*q++ = ' ';
|
2016-04-15 05:58:26 +00:00
|
|
|
|
memcpy(q, s, n);
|
2015-04-13 17:03:53 +00:00
|
|
|
|
q += n;
|
2016-04-15 05:58:26 +00:00
|
|
|
|
siz -= n + 1;
|
2015-04-13 17:03:53 +00:00
|
|
|
|
}
|
|
|
|
|
*q = '\0';
|
2015-04-21 14:27:51 +00:00
|
|
|
|
if (system(cmd) != 0)
|
|
|
|
|
perror("Couldn't call stty");
|
2015-04-13 17:03:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
ttynew(void)
|
|
|
|
|
{
|
2009-05-10 12:17:09 +00:00
|
|
|
|
int m, s;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
struct winsize w = {term.row, term.col, 0, 0};
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (opt_io) {
|
2015-04-13 17:03:53 +00:00
|
|
|
|
term.mode |= MODE_PRINT;
|
|
|
|
|
iofd = (!strcmp(opt_io, "-")) ?
|
2015-07-08 21:49:25 +00:00
|
|
|
|
1 : open(opt_io, O_WRONLY | O_CREAT, 0666);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (iofd < 0) {
|
2015-04-13 17:03:53 +00:00
|
|
|
|
fprintf(stderr, "Error opening %s:%s\n",
|
|
|
|
|
opt_io, strerror(errno));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt_line) {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((cmdfd = open(opt_line, O_RDWR)) < 0)
|
2015-04-13 17:03:53 +00:00
|
|
|
|
die("open line failed: %s\n", strerror(errno));
|
2015-09-22 11:13:25 +00:00
|
|
|
|
dup2(cmdfd, 0);
|
2015-04-13 17:03:53 +00:00
|
|
|
|
stty();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-28 01:18:22 +00:00
|
|
|
|
/* seems to work fine on linux, openbsd and freebsd */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (openpty(&m, &s, NULL, NULL, &w) < 0)
|
2014-04-20 11:15:40 +00:00
|
|
|
|
die("openpty failed: %s\n", strerror(errno));
|
2010-08-28 01:18:22 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (pid = fork()) {
|
2009-05-10 12:17:09 +00:00
|
|
|
|
case -1:
|
2009-06-11 14:41:14 +00:00
|
|
|
|
die("fork failed\n");
|
2009-05-10 12:17:09 +00:00
|
|
|
|
break;
|
|
|
|
|
case 0:
|
2015-04-13 17:03:53 +00:00
|
|
|
|
close(iofd);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
setsid(); /* create a new process group */
|
2015-07-08 21:49:25 +00:00
|
|
|
|
dup2(s, 0);
|
|
|
|
|
dup2(s, 1);
|
|
|
|
|
dup2(s, 2);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (ioctl(s, TIOCSCTTY, NULL) < 0)
|
2014-04-20 11:15:40 +00:00
|
|
|
|
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
|
2010-08-26 19:36:21 +00:00
|
|
|
|
close(s);
|
|
|
|
|
close(m);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
execsh();
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
close(s);
|
|
|
|
|
cmdfd = m;
|
2009-06-11 14:41:14 +00:00
|
|
|
|
signal(SIGCHLD, sigchld);
|
2014-04-26 21:50:37 +00:00
|
|
|
|
break;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-06 19:01:00 +00:00
|
|
|
|
size_t
|
2015-07-09 21:59:50 +00:00
|
|
|
|
ttyread(void)
|
|
|
|
|
{
|
2010-11-27 20:19:31 +00:00
|
|
|
|
static char buf[BUFSIZ];
|
2011-04-26 18:29:28 +00:00
|
|
|
|
static int buflen = 0;
|
2010-11-27 20:19:31 +00:00
|
|
|
|
char *ptr;
|
|
|
|
|
int charsize; /* size of utf8 char in bytes */
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune unicodep;
|
2010-11-27 20:19:31 +00:00
|
|
|
|
int ret;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2010-11-27 20:19:31 +00:00
|
|
|
|
/* append read bytes to unprocessed bytes */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
|
2014-04-20 11:15:40 +00:00
|
|
|
|
die("Couldn't read from shell: %s\n", strerror(errno));
|
2010-11-27 20:19:31 +00:00
|
|
|
|
|
|
|
|
|
buflen += ret;
|
|
|
|
|
ptr = buf;
|
|
|
|
|
|
2016-09-13 12:01:18 +00:00
|
|
|
|
for (;;) {
|
2016-09-14 06:27:32 +00:00
|
|
|
|
if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
|
2016-09-13 12:01:18 +00:00
|
|
|
|
/* process a complete utf8 char */
|
|
|
|
|
charsize = utf8decode(ptr, &unicodep, buflen);
|
|
|
|
|
if (charsize == 0)
|
|
|
|
|
break;
|
|
|
|
|
tputc(unicodep);
|
|
|
|
|
ptr += charsize;
|
|
|
|
|
buflen -= charsize;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
if (buflen <= 0)
|
|
|
|
|
break;
|
|
|
|
|
tputc(*ptr++ & 0xFF);
|
|
|
|
|
buflen--;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-11-27 20:19:31 +00:00
|
|
|
|
/* keep any uncomplete utf8 char for the next call */
|
2016-09-13 12:01:18 +00:00
|
|
|
|
if (buflen > 0)
|
|
|
|
|
memmove(buf, ptr, buflen);
|
2015-11-06 19:01:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
needdraw = true;
|
2015-11-06 19:01:00 +00:00
|
|
|
|
return ret;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
ttywrite(const char *s, size_t n)
|
|
|
|
|
{
|
2015-11-06 19:01:00 +00:00
|
|
|
|
fd_set wfd, rfd;
|
2015-07-10 12:15:39 +00:00
|
|
|
|
ssize_t r;
|
2015-11-06 19:01:00 +00:00
|
|
|
|
size_t lim = 256;
|
2015-07-10 12:15:39 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* 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);
|
2015-11-06 19:01:00 +00:00
|
|
|
|
FD_ZERO(&rfd);
|
2015-07-10 12:15:39 +00:00
|
|
|
|
FD_SET(cmdfd, &wfd);
|
2015-11-06 19:01:00 +00:00
|
|
|
|
FD_SET(cmdfd, &rfd);
|
2015-07-10 12:15:39 +00:00
|
|
|
|
|
|
|
|
|
/* Check if we can write. */
|
2015-11-06 19:01:00 +00:00
|
|
|
|
if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) {
|
2015-07-10 12:15:39 +00:00
|
|
|
|
if (errno == EINTR)
|
|
|
|
|
continue;
|
|
|
|
|
die("select failed: %s\n", strerror(errno));
|
|
|
|
|
}
|
2015-11-06 19:01:00 +00:00
|
|
|
|
if (FD_ISSET(cmdfd, &wfd)) {
|
2015-07-10 12:15:39 +00:00
|
|
|
|
/*
|
2015-11-06 19:46:23 +00:00
|
|
|
|
* 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.
|
2015-07-10 12:15:39 +00:00
|
|
|
|
*/
|
2015-11-06 19:46:23 +00:00
|
|
|
|
if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0)
|
2015-11-06 19:01:00 +00:00
|
|
|
|
goto write_error;
|
2015-07-10 12:15:39 +00:00
|
|
|
|
if (r < n) {
|
|
|
|
|
/*
|
|
|
|
|
* We weren't able to write out everything.
|
|
|
|
|
* This means the buffer is getting full
|
|
|
|
|
* again. Empty it.
|
|
|
|
|
*/
|
2015-11-06 19:01:00 +00:00
|
|
|
|
if (n < lim)
|
|
|
|
|
lim = ttyread();
|
2015-07-10 12:15:39 +00:00
|
|
|
|
n -= r;
|
|
|
|
|
s += r;
|
|
|
|
|
} else {
|
|
|
|
|
/* All bytes have been written. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-11-21 17:21:03 +00:00
|
|
|
|
if (FD_ISSET(cmdfd, &rfd))
|
|
|
|
|
lim = ttyread();
|
2015-07-10 12:15:39 +00:00
|
|
|
|
}
|
2015-11-06 19:01:00 +00:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
write_error:
|
|
|
|
|
die("write error on tty: %s\n", strerror(errno));
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-10-05 09:49:35 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
ttysend(char *s, size_t n)
|
|
|
|
|
{
|
2015-04-21 21:29:15 +00:00
|
|
|
|
int len;
|
2016-09-13 12:01:18 +00:00
|
|
|
|
char *t, *lim;
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune u;
|
2015-04-21 21:29:15 +00:00
|
|
|
|
|
2013-10-05 09:49:35 +00:00
|
|
|
|
ttywrite(s, n);
|
2016-09-13 12:01:18 +00:00
|
|
|
|
if (!IS_SET(MODE_ECHO))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
lim = &s[n];
|
|
|
|
|
for (t = s; t < lim; t += len) {
|
2016-09-14 06:27:32 +00:00
|
|
|
|
if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
|
2016-09-13 12:01:18 +00:00
|
|
|
|
len = utf8decode(t, &u, n);
|
|
|
|
|
} else {
|
|
|
|
|
u = *t & 0xFF;
|
|
|
|
|
len = 1;
|
2015-04-21 21:29:15 +00:00
|
|
|
|
}
|
2016-09-13 12:01:18 +00:00
|
|
|
|
if (len <= 0)
|
|
|
|
|
break;
|
|
|
|
|
techo(u);
|
|
|
|
|
n -= len;
|
|
|
|
|
}
|
2013-10-05 09:49:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
ttyresize(void)
|
|
|
|
|
{
|
2009-05-10 12:17:09 +00:00
|
|
|
|
struct winsize w;
|
|
|
|
|
|
|
|
|
|
w.ws_row = term.row;
|
|
|
|
|
w.ws_col = term.col;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
w.ws_xpixel = wl.tw;
|
|
|
|
|
w.ws_ypixel = wl.th;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
|
2014-04-20 11:15:40 +00:00
|
|
|
|
fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2008-05-20 09:03:59 +00:00
|
|
|
|
|
2013-04-26 16:41:54 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tattrset(int attr)
|
|
|
|
|
{
|
2013-04-26 16:41:54 +00:00
|
|
|
|
int i, j;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < term.row-1; i++) {
|
|
|
|
|
for (j = 0; j < term.col-1; j++) {
|
|
|
|
|
if (term.line[i][j].mode & attr)
|
2013-04-26 16:41:54 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-20 21:20:59 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tsetdirt(int top, int bot)
|
|
|
|
|
{
|
2011-10-20 21:20:59 +00:00
|
|
|
|
int i;
|
2012-02-27 11:44:02 +00:00
|
|
|
|
|
|
|
|
|
LIMIT(top, 0, term.row-1);
|
|
|
|
|
LIMIT(bot, 0, term.row-1);
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = top; i <= bot; i++)
|
2011-10-20 21:20:59 +00:00
|
|
|
|
term.dirty[i] = 1;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
|
|
|
|
needdraw = true;
|
2011-10-20 21:20:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-04-26 16:41:54 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tsetdirtattr(int attr)
|
|
|
|
|
{
|
2013-04-26 16:41:54 +00:00
|
|
|
|
int i, j;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < term.row-1; i++) {
|
|
|
|
|
for (j = 0; j < term.col-1; j++) {
|
|
|
|
|
if (term.line[i][j].mode & attr) {
|
2013-04-26 16:41:54 +00:00
|
|
|
|
tsetdirt(i, i);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-27 11:44:02 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tfulldirt(void)
|
|
|
|
|
{
|
2012-02-27 11:44:02 +00:00
|
|
|
|
tsetdirt(0, term.row-1);
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tcursor(int mode)
|
|
|
|
|
{
|
2013-10-01 18:02:24 +00:00
|
|
|
|
static TCursor c[2];
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int alt = IS_SET(MODE_ALTSCREEN);
|
2010-02-08 22:16:55 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (mode == CURSOR_SAVE) {
|
2013-10-01 18:02:24 +00:00
|
|
|
|
c[alt] = term.c;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (mode == CURSOR_LOAD) {
|
2013-10-01 18:02:24 +00:00
|
|
|
|
term.c = c[alt];
|
|
|
|
|
tmoveto(c[alt].x, c[alt].y);
|
2012-10-06 07:58:45 +00:00
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-11 22:50:50 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
treset(void)
|
|
|
|
|
{
|
2012-09-19 14:03:16 +00:00
|
|
|
|
uint i;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2010-08-29 16:55:15 +00:00
|
|
|
|
term.c = (TCursor){{
|
2011-04-26 18:29:28 +00:00
|
|
|
|
.mode = ATTR_NULL,
|
2012-11-02 18:56:02 +00:00
|
|
|
|
.fg = defaultfg,
|
|
|
|
|
.bg = defaultbg
|
2010-08-29 23:35:37 +00:00
|
|
|
|
}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
|
2012-08-29 17:59:37 +00:00
|
|
|
|
|
|
|
|
|
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = tabspaces; i < term.col; i += tabspaces)
|
2012-08-29 17:59:37 +00:00
|
|
|
|
term.tabs[i] = 1;
|
2012-10-06 11:43:01 +00:00
|
|
|
|
term.top = 0;
|
|
|
|
|
term.bot = term.row - 1;
|
2016-09-13 12:01:18 +00:00
|
|
|
|
term.mode = MODE_WRAP|MODE_UTF8;
|
2015-04-18 23:24:28 +00:00
|
|
|
|
memset(term.trantbl, CS_USA, sizeof(term.trantbl));
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
term.charset = 0;
|
2012-09-24 09:04:26 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < 2; i++) {
|
2014-08-18 17:20:41 +00:00
|
|
|
|
tmoveto(0, 0);
|
|
|
|
|
tcursor(CURSOR_SAVE);
|
|
|
|
|
tclearregion(0, 0, term.col-1, term.row-1);
|
|
|
|
|
tswapscreen();
|
|
|
|
|
}
|
2010-03-11 22:50:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tnew(int col, int row)
|
|
|
|
|
{
|
2013-08-25 22:10:47 +00:00
|
|
|
|
term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
|
2013-04-14 20:12:10 +00:00
|
|
|
|
tresize(col, row);
|
2012-11-25 08:23:02 +00:00
|
|
|
|
term.numlock = 1;
|
2013-04-18 04:41:54 +00:00
|
|
|
|
|
2010-08-29 16:55:15 +00:00
|
|
|
|
treset();
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-08-30 14:48:18 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tswapscreen(void)
|
|
|
|
|
{
|
2012-10-06 07:58:45 +00:00
|
|
|
|
Line *tmp = term.line;
|
|
|
|
|
|
2010-08-30 14:48:18 +00:00
|
|
|
|
term.line = term.alt;
|
|
|
|
|
term.alt = tmp;
|
|
|
|
|
term.mode ^= MODE_ALTSCREEN;
|
2011-10-20 21:20:59 +00:00
|
|
|
|
tfulldirt();
|
2010-08-30 14:48:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-11 22:50:50 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tscrolldown(int orig, int n)
|
|
|
|
|
{
|
2010-03-11 22:50:50 +00:00
|
|
|
|
int i;
|
|
|
|
|
Line temp;
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2010-09-01 21:20:54 +00:00
|
|
|
|
LIMIT(n, 0, term.bot-orig+1);
|
2010-03-11 22:50:50 +00:00
|
|
|
|
|
2014-04-20 13:26:13 +00:00
|
|
|
|
tsetdirt(orig, term.bot-n);
|
2014-04-20 13:26:50 +00:00
|
|
|
|
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = term.bot; i >= orig+n; i--) {
|
2010-03-11 22:50:50 +00:00
|
|
|
|
temp = term.line[i];
|
|
|
|
|
term.line[i] = term.line[i-n];
|
|
|
|
|
term.line[i-n] = temp;
|
|
|
|
|
}
|
2011-09-16 16:48:16 +00:00
|
|
|
|
|
|
|
|
|
selscroll(orig, n);
|
2010-03-11 22:50:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tscrollup(int orig, int n)
|
|
|
|
|
{
|
2010-03-11 22:50:50 +00:00
|
|
|
|
int i;
|
|
|
|
|
Line temp;
|
2014-04-20 13:26:39 +00:00
|
|
|
|
|
2010-09-01 21:20:54 +00:00
|
|
|
|
LIMIT(n, 0, term.bot-orig+1);
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(0, orig, term.col-1, orig+n-1);
|
2014-04-20 13:26:13 +00:00
|
|
|
|
tsetdirt(orig+n, term.bot);
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = orig; i <= term.bot-n; i++) {
|
2014-04-20 13:26:39 +00:00
|
|
|
|
temp = term.line[i];
|
|
|
|
|
term.line[i] = term.line[i+n];
|
|
|
|
|
term.line[i+n] = temp;
|
2010-08-29 17:41:36 +00:00
|
|
|
|
}
|
2011-09-16 16:48:16 +00:00
|
|
|
|
|
|
|
|
|
selscroll(orig, -n);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
selscroll(int orig, int n)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.ob.x == -1)
|
2011-09-16 16:48:16 +00:00
|
|
|
|
return;
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
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) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selclear();
|
2011-09-16 16:48:16 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.type == SEL_RECTANGULAR) {
|
|
|
|
|
if (sel.ob.y < term.top)
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.ob.y = term.top;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.oe.y > term.bot)
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.oe.y = term.bot;
|
2013-03-29 17:39:01 +00:00
|
|
|
|
} else {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.ob.y < term.top) {
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.ob.y = term.top;
|
|
|
|
|
sel.ob.x = 0;
|
2013-02-19 18:08:41 +00:00
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.oe.y > term.bot) {
|
2013-05-26 11:07:26 +00:00
|
|
|
|
sel.oe.y = term.bot;
|
|
|
|
|
sel.oe.x = term.col;
|
2013-02-19 18:08:41 +00:00
|
|
|
|
}
|
2013-03-29 17:39:01 +00:00
|
|
|
|
}
|
2014-06-03 02:34:58 +00:00
|
|
|
|
selnormalize();
|
2011-09-16 16:48:16 +00:00
|
|
|
|
}
|
2010-03-11 22:50:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tnewline(int first_col)
|
|
|
|
|
{
|
2010-09-01 21:20:54 +00:00
|
|
|
|
int y = term.c.y;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (y == term.bot) {
|
2010-09-01 21:20:54 +00:00
|
|
|
|
tscrollup(term.top, 1);
|
2012-10-06 07:58:45 +00:00
|
|
|
|
} else {
|
2010-09-01 21:20:54 +00:00
|
|
|
|
y++;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
}
|
2010-10-16 18:50:29 +00:00
|
|
|
|
tmoveto(first_col ? 0 : term.c.x, y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
csiparse(void)
|
|
|
|
|
{
|
2013-02-25 12:23:56 +00:00
|
|
|
|
char *p = csiescseq.buf, *np;
|
|
|
|
|
long int v;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2012-08-29 21:14:20 +00:00
|
|
|
|
csiescseq.narg = 0;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (*p == '?') {
|
2013-02-25 12:36:40 +00:00
|
|
|
|
csiescseq.priv = 1;
|
|
|
|
|
p++;
|
|
|
|
|
}
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2013-02-26 20:43:40 +00:00
|
|
|
|
csiescseq.buf[csiescseq.len] = '\0';
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (p < csiescseq.buf+csiescseq.len) {
|
2013-02-26 18:07:23 +00:00
|
|
|
|
np = NULL;
|
2013-02-25 12:23:56 +00:00
|
|
|
|
v = strtol(p, &np, 10);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (np == p)
|
2013-02-26 18:07:23 +00:00
|
|
|
|
v = 0;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (v == LONG_MAX || v == LONG_MIN)
|
2013-02-25 12:23:56 +00:00
|
|
|
|
v = -1;
|
2013-02-26 17:19:44 +00:00
|
|
|
|
csiescseq.arg[csiescseq.narg++] = v;
|
|
|
|
|
p = np;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
2013-02-26 17:19:44 +00:00
|
|
|
|
break;
|
|
|
|
|
p++;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2015-03-18 20:12:47 +00:00
|
|
|
|
csiescseq.mode[0] = *p++;
|
|
|
|
|
csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-08 16:21:10 +00:00
|
|
|
|
/* for absolute user moves, when decom is set */
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tmoveato(int x, int y)
|
|
|
|
|
{
|
2012-11-08 16:21:10 +00:00
|
|
|
|
tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tmoveto(int x, int y)
|
|
|
|
|
{
|
2012-11-08 16:21:10 +00:00
|
|
|
|
int miny, maxy;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.state & CURSOR_ORIGIN) {
|
2012-11-08 16:21:10 +00:00
|
|
|
|
miny = term.top;
|
|
|
|
|
maxy = term.bot;
|
|
|
|
|
} else {
|
|
|
|
|
miny = 0;
|
|
|
|
|
maxy = term.row - 1;
|
|
|
|
|
}
|
2010-08-29 23:35:37 +00:00
|
|
|
|
term.c.state &= ~CURSOR_WRAPNEXT;
|
2015-04-13 12:03:51 +00:00
|
|
|
|
term.c.x = LIMIT(x, 0, term.col-1);
|
|
|
|
|
term.c.y = LIMIT(y, miny, maxy);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tsetchar(Rune u, Glyph *attr, int x, int y)
|
|
|
|
|
{
|
2012-10-07 09:06:08 +00:00
|
|
|
|
static char *vt100_0[62] = { /* 0x41 - 0x7e */
|
2012-10-06 07:58:45 +00:00
|
|
|
|
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
|
|
|
|
|
"◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
|
|
|
|
|
"", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
|
|
|
|
|
"⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
|
|
|
|
|
"│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
|
|
|
|
|
};
|
|
|
|
|
|
2012-09-26 18:21:08 +00:00
|
|
|
|
/*
|
|
|
|
|
* The table is proudly stolen from rxvt.
|
|
|
|
|
*/
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
|
2015-04-21 21:29:15 +00:00
|
|
|
|
BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
|
|
|
|
|
utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
|
2012-09-26 18:21:08 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.line[y][x].mode & ATTR_WIDE) {
|
|
|
|
|
if (x+1 < term.col) {
|
2015-04-21 21:29:01 +00:00
|
|
|
|
term.line[y][x+1].u = ' ';
|
2013-09-07 10:41:36 +00:00
|
|
|
|
term.line[y][x+1].mode &= ~ATTR_WDUMMY;
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (term.line[y][x].mode & ATTR_WDUMMY) {
|
2015-04-21 21:29:01 +00:00
|
|
|
|
term.line[y][x-1].u = ' ';
|
2013-09-07 10:41:36 +00:00
|
|
|
|
term.line[y][x-1].mode &= ~ATTR_WIDE;
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-07 09:06:17 +00:00
|
|
|
|
term.dirty[y] = 1;
|
|
|
|
|
term.line[y][x] = *attr;
|
2015-04-21 21:29:15 +00:00
|
|
|
|
term.line[y][x].u = u;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tclearregion(int x1, int y1, int x2, int y2)
|
|
|
|
|
{
|
2013-04-24 19:30:59 +00:00
|
|
|
|
int x, y, temp;
|
2014-08-07 08:11:38 +00:00
|
|
|
|
Glyph *gp;
|
2010-03-11 22:50:50 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (x1 > x2)
|
2010-03-11 22:50:50 +00:00
|
|
|
|
temp = x1, x1 = x2, x2 = temp;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (y1 > y2)
|
2010-03-11 22:50:50 +00:00
|
|
|
|
temp = y1, y1 = y2, y2 = temp;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
|
|
|
|
LIMIT(x1, 0, term.col-1);
|
|
|
|
|
LIMIT(x2, 0, term.col-1);
|
|
|
|
|
LIMIT(y1, 0, term.row-1);
|
|
|
|
|
LIMIT(y2, 0, term.row-1);
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (y = y1; y <= y2; y++) {
|
2011-10-20 21:20:59 +00:00
|
|
|
|
term.dirty[y] = 1;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (x = x1; x <= x2; x++) {
|
2014-08-07 08:11:38 +00:00
|
|
|
|
gp = &term.line[y][x];
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (selected(x, y))
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selclear();
|
2014-08-07 08:11:38 +00:00
|
|
|
|
gp->fg = term.c.attr.fg;
|
|
|
|
|
gp->bg = term.c.attr.bg;
|
|
|
|
|
gp->mode = 0;
|
2015-04-21 21:29:01 +00:00
|
|
|
|
gp->u = ' ';
|
2013-01-20 13:54:35 +00:00
|
|
|
|
}
|
2011-10-20 21:20:59 +00:00
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdeletechar(int n)
|
|
|
|
|
{
|
2014-04-22 22:08:13 +00:00
|
|
|
|
int dst, src, size;
|
2014-04-25 15:24:12 +00:00
|
|
|
|
Glyph *line;
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2014-04-22 22:08:13 +00:00
|
|
|
|
LIMIT(n, 0, term.col - term.c.x);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2014-04-22 22:08:13 +00:00
|
|
|
|
dst = term.c.x;
|
|
|
|
|
src = term.c.x + n;
|
|
|
|
|
size = term.col - src;
|
2014-04-25 15:24:12 +00:00
|
|
|
|
line = term.line[term.c.y];
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2014-04-25 15:24:12 +00:00
|
|
|
|
memmove(&line[dst], &line[src], size * sizeof(Glyph));
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tinsertblank(int n)
|
|
|
|
|
{
|
2014-04-22 22:08:13 +00:00
|
|
|
|
int dst, src, size;
|
2014-04-25 15:24:12 +00:00
|
|
|
|
Glyph *line;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2014-04-22 22:08:13 +00:00
|
|
|
|
LIMIT(n, 0, term.col - term.c.x);
|
2011-10-20 21:20:59 +00:00
|
|
|
|
|
2014-04-22 22:08:13 +00:00
|
|
|
|
dst = term.c.x + n;
|
|
|
|
|
src = term.c.x;
|
|
|
|
|
size = term.col - dst;
|
2014-04-25 15:24:12 +00:00
|
|
|
|
line = term.line[term.c.y];
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2014-04-25 15:24:12 +00:00
|
|
|
|
memmove(&line[dst], &line[src], size * sizeof(Glyph));
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(src, term.c.y, dst - 1, term.c.y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tinsertblankline(int n)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (BETWEEN(term.c.y, term.top, term.bot))
|
2014-04-22 17:59:01 +00:00
|
|
|
|
tscrolldown(term.c.y, n);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdeleteline(int n)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (BETWEEN(term.c.y, term.top, term.bot))
|
2014-04-22 17:59:01 +00:00
|
|
|
|
tscrollup(term.c.y, n);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-11-25 13:09:53 +00:00
|
|
|
|
int32_t
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdefcolor(int *attr, int *npar, int l)
|
|
|
|
|
{
|
2013-11-24 09:20:45 +00:00
|
|
|
|
int32_t idx = -1;
|
2013-07-19 18:34:36 +00:00
|
|
|
|
uint r, g, b;
|
|
|
|
|
|
|
|
|
|
switch (attr[*npar + 1]) {
|
2014-06-01 15:08:16 +00:00
|
|
|
|
case 2: /* direct color in RGB space */
|
2013-07-19 18:34:36 +00:00
|
|
|
|
if (*npar + 4 >= l) {
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"erresc(38): Incorrect number of parameters (%d)\n",
|
|
|
|
|
*npar);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
r = attr[*npar + 2];
|
|
|
|
|
g = attr[*npar + 3];
|
|
|
|
|
b = attr[*npar + 4];
|
|
|
|
|
*npar += 4;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
|
2015-04-22 13:07:59 +00:00
|
|
|
|
fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
|
2013-07-19 18:34:36 +00:00
|
|
|
|
r, g, b);
|
|
|
|
|
else
|
|
|
|
|
idx = TRUECOLOR(r, g, b);
|
|
|
|
|
break;
|
2014-06-01 15:08:16 +00:00
|
|
|
|
case 5: /* indexed color */
|
2013-07-19 18:34:36 +00:00
|
|
|
|
if (*npar + 2 >= l) {
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"erresc(38): Incorrect number of parameters (%d)\n",
|
|
|
|
|
*npar);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
*npar += 2;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!BETWEEN(attr[*npar], 0, 255))
|
2013-07-19 18:34:36 +00:00
|
|
|
|
fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
|
|
|
|
|
else
|
|
|
|
|
idx = attr[*npar];
|
|
|
|
|
break;
|
|
|
|
|
case 0: /* implemented defined (only foreground) */
|
|
|
|
|
case 1: /* transparent */
|
2014-06-01 15:08:16 +00:00
|
|
|
|
case 3: /* direct color in CMY space */
|
|
|
|
|
case 4: /* direct color in CMYK space */
|
2013-07-19 18:34:36 +00:00
|
|
|
|
default:
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"erresc(38): gfx attr %d unknown\n", attr[*npar]);
|
2014-04-26 21:50:37 +00:00
|
|
|
|
break;
|
2013-07-19 18:34:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return idx;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tsetattr(int *attr, int l)
|
|
|
|
|
{
|
2009-05-10 12:17:09 +00:00
|
|
|
|
int i;
|
2013-11-24 09:20:45 +00:00
|
|
|
|
int32_t idx;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < l; i++) {
|
|
|
|
|
switch (attr[i]) {
|
2009-06-17 00:58:40 +00:00
|
|
|
|
case 0:
|
2014-06-21 18:29:36 +00:00
|
|
|
|
term.c.attr.mode &= ~(
|
|
|
|
|
ATTR_BOLD |
|
|
|
|
|
ATTR_FAINT |
|
|
|
|
|
ATTR_ITALIC |
|
|
|
|
|
ATTR_UNDERLINE |
|
|
|
|
|
ATTR_BLINK |
|
|
|
|
|
ATTR_REVERSE |
|
|
|
|
|
ATTR_INVISIBLE |
|
|
|
|
|
ATTR_STRUCK );
|
2012-11-02 18:56:02 +00:00
|
|
|
|
term.c.attr.fg = defaultfg;
|
|
|
|
|
term.c.attr.bg = defaultbg;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
|
|
|
|
case 1:
|
2011-04-26 18:29:28 +00:00
|
|
|
|
term.c.attr.mode |= ATTR_BOLD;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2014-06-21 18:29:36 +00:00
|
|
|
|
case 2:
|
|
|
|
|
term.c.attr.mode |= ATTR_FAINT;
|
|
|
|
|
break;
|
2013-01-08 19:36:49 +00:00
|
|
|
|
case 3:
|
2012-09-05 19:48:26 +00:00
|
|
|
|
term.c.attr.mode |= ATTR_ITALIC;
|
2012-09-02 17:53:50 +00:00
|
|
|
|
break;
|
2011-04-26 18:29:28 +00:00
|
|
|
|
case 4:
|
2010-02-08 22:16:55 +00:00
|
|
|
|
term.c.attr.mode |= ATTR_UNDERLINE;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2013-01-27 12:26:06 +00:00
|
|
|
|
case 5: /* slow blink */
|
2014-07-31 17:37:59 +00:00
|
|
|
|
/* FALLTHROUGH */
|
2014-06-21 18:29:36 +00:00
|
|
|
|
case 6: /* rapid blink */
|
2014-07-31 17:37:59 +00:00
|
|
|
|
term.c.attr.mode |= ATTR_BLINK;
|
2014-06-21 18:29:36 +00:00
|
|
|
|
break;
|
2011-04-26 18:29:28 +00:00
|
|
|
|
case 7:
|
|
|
|
|
term.c.attr.mode |= ATTR_REVERSE;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2014-06-21 18:29:36 +00:00
|
|
|
|
case 8:
|
|
|
|
|
term.c.attr.mode |= ATTR_INVISIBLE;
|
|
|
|
|
break;
|
|
|
|
|
case 9:
|
|
|
|
|
term.c.attr.mode |= ATTR_STRUCK;
|
|
|
|
|
break;
|
|
|
|
|
case 22:
|
2014-07-26 07:48:15 +00:00
|
|
|
|
term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
|
2014-06-21 18:29:36 +00:00
|
|
|
|
break;
|
2013-01-08 19:36:49 +00:00
|
|
|
|
case 23:
|
2012-09-05 19:48:26 +00:00
|
|
|
|
term.c.attr.mode &= ~ATTR_ITALIC;
|
2012-09-02 17:53:50 +00:00
|
|
|
|
break;
|
2011-04-26 18:29:28 +00:00
|
|
|
|
case 24:
|
2010-02-08 22:16:55 +00:00
|
|
|
|
term.c.attr.mode &= ~ATTR_UNDERLINE;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2012-09-12 11:08:26 +00:00
|
|
|
|
case 25:
|
2014-07-31 17:37:59 +00:00
|
|
|
|
term.c.attr.mode &= ~ATTR_BLINK;
|
2014-06-21 18:29:36 +00:00
|
|
|
|
break;
|
2011-04-26 18:29:28 +00:00
|
|
|
|
case 27:
|
|
|
|
|
term.c.attr.mode &= ~ATTR_REVERSE;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2014-06-21 18:29:36 +00:00
|
|
|
|
case 28:
|
|
|
|
|
term.c.attr.mode &= ~ATTR_INVISIBLE;
|
|
|
|
|
break;
|
|
|
|
|
case 29:
|
|
|
|
|
term.c.attr.mode &= ~ATTR_STRUCK;
|
|
|
|
|
break;
|
2010-07-24 11:09:14 +00:00
|
|
|
|
case 38:
|
2013-07-19 18:34:36 +00:00
|
|
|
|
if ((idx = tdefcolor(attr, &i, l)) >= 0)
|
|
|
|
|
term.c.attr.fg = idx;
|
2010-07-24 11:09:14 +00:00
|
|
|
|
break;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
case 39:
|
2012-11-02 18:56:02 +00:00
|
|
|
|
term.c.attr.fg = defaultfg;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2010-07-24 11:09:14 +00:00
|
|
|
|
case 48:
|
2013-07-19 18:34:36 +00:00
|
|
|
|
if ((idx = tdefcolor(attr, &i, l)) >= 0)
|
|
|
|
|
term.c.attr.bg = idx;
|
2010-07-24 11:09:14 +00:00
|
|
|
|
break;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
case 49:
|
2012-11-02 18:56:02 +00:00
|
|
|
|
term.c.attr.bg = defaultbg;
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (BETWEEN(attr[i], 30, 37)) {
|
2009-06-17 00:58:40 +00:00
|
|
|
|
term.c.attr.fg = attr[i] - 30;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (BETWEEN(attr[i], 40, 47)) {
|
2009-06-17 00:58:40 +00:00
|
|
|
|
term.c.attr.bg = attr[i] - 40;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (BETWEEN(attr[i], 90, 97)) {
|
2010-07-24 11:09:14 +00:00
|
|
|
|
term.c.attr.fg = attr[i] - 90 + 8;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (BETWEEN(attr[i], 100, 107)) {
|
2012-09-12 11:20:10 +00:00
|
|
|
|
term.c.attr.bg = attr[i] - 100 + 8;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
} else {
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"erresc(default): gfx attr %d unknown\n",
|
|
|
|
|
attr[i]), csidump();
|
|
|
|
|
}
|
2009-06-17 00:58:40 +00:00
|
|
|
|
break;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2009-06-17 00:58:40 +00:00
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tsetscroll(int t, int b)
|
|
|
|
|
{
|
2009-05-10 12:17:09 +00:00
|
|
|
|
int temp;
|
|
|
|
|
|
|
|
|
|
LIMIT(t, 0, term.row-1);
|
|
|
|
|
LIMIT(b, 0, term.row-1);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (t > b) {
|
2009-05-10 12:17:09 +00:00
|
|
|
|
temp = t;
|
|
|
|
|
t = b;
|
|
|
|
|
b = temp;
|
|
|
|
|
}
|
|
|
|
|
term.top = t;
|
2011-04-26 18:29:28 +00:00
|
|
|
|
term.bot = b;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-09-02 17:09:35 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tsetmode(int priv, int set, int *args, int narg)
|
|
|
|
|
{
|
2012-09-02 17:09:35 +00:00
|
|
|
|
int *lim, mode;
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int alt;
|
2012-09-02 17:09:35 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (lim = args + narg; args < lim; ++args) {
|
|
|
|
|
if (priv) {
|
|
|
|
|
switch (*args) {
|
2012-09-24 08:29:37 +00:00
|
|
|
|
case 1: /* DECCKM -- Cursor key */
|
2012-11-13 19:04:34 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_APPCURSOR);
|
2012-09-02 17:09:35 +00:00
|
|
|
|
break;
|
2012-10-04 20:59:45 +00:00
|
|
|
|
case 5: /* DECSCNM -- Reverse video */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
mode = term.mode;
|
2012-09-29 09:17:16 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_REVERSE);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (mode != term.mode)
|
2015-02-14 23:34:03 +00:00
|
|
|
|
redraw();
|
2012-09-02 17:09:35 +00:00
|
|
|
|
break;
|
2012-11-08 16:21:10 +00:00
|
|
|
|
case 6: /* DECOM -- Origin */
|
|
|
|
|
MODBIT(term.c.state, set, CURSOR_ORIGIN);
|
|
|
|
|
tmoveato(0, 0);
|
2012-09-24 08:29:37 +00:00
|
|
|
|
break;
|
|
|
|
|
case 7: /* DECAWM -- Auto wrap */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_WRAP);
|
|
|
|
|
break;
|
2012-09-24 08:29:37 +00:00
|
|
|
|
case 0: /* Error (IGNORED) */
|
2012-11-08 16:22:04 +00:00
|
|
|
|
case 2: /* DECANM -- ANSI/VT52 (IGNORED) */
|
|
|
|
|
case 3: /* DECCOLM -- Column (IGNORED) */
|
|
|
|
|
case 4: /* DECSCLM -- Scroll (IGNORED) */
|
|
|
|
|
case 8: /* DECARM -- Auto repeat (IGNORED) */
|
|
|
|
|
case 18: /* DECPFF -- Printer feed (IGNORED) */
|
|
|
|
|
case 19: /* DECPEX -- Printer extent (IGNORED) */
|
|
|
|
|
case 42: /* DECNRCM -- National characters (IGNORED) */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
case 12: /* att610 -- Start blinking cursor (IGNORED) */
|
|
|
|
|
break;
|
2012-11-08 16:15:26 +00:00
|
|
|
|
case 25: /* DECTCEM -- Text Cursor Enable Mode */
|
|
|
|
|
MODBIT(term.mode, !set, MODE_HIDE);
|
2012-09-02 17:09:35 +00:00
|
|
|
|
break;
|
2013-06-01 12:37:30 +00:00
|
|
|
|
case 9: /* X10 mouse compatibility mode */
|
|
|
|
|
MODBIT(term.mode, 0, MODE_MOUSE);
|
|
|
|
|
MODBIT(term.mode, set, MODE_MOUSEX10);
|
|
|
|
|
break;
|
|
|
|
|
case 1000: /* 1000: report button press */
|
|
|
|
|
MODBIT(term.mode, 0, MODE_MOUSE);
|
2012-09-02 17:09:35 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_MOUSEBTN);
|
|
|
|
|
break;
|
2013-06-01 12:37:30 +00:00
|
|
|
|
case 1002: /* 1002: report motion on button press */
|
|
|
|
|
MODBIT(term.mode, 0, MODE_MOUSE);
|
2012-09-02 17:09:35 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_MOUSEMOTION);
|
|
|
|
|
break;
|
2013-06-01 12:37:30 +00:00
|
|
|
|
case 1003: /* 1003: enable all mouse motions */
|
|
|
|
|
MODBIT(term.mode, 0, MODE_MOUSE);
|
|
|
|
|
MODBIT(term.mode, set, MODE_MOUSEMANY);
|
2013-06-01 11:06:53 +00:00
|
|
|
|
break;
|
2013-06-01 12:37:30 +00:00
|
|
|
|
case 1004: /* 1004: send focus events to tty */
|
2013-06-01 11:06:53 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_FOCUS);
|
|
|
|
|
break;
|
2013-06-01 12:37:30 +00:00
|
|
|
|
case 1006: /* 1006: extended reporting mode */
|
2013-01-26 14:13:56 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_MOUSESGR);
|
|
|
|
|
break;
|
2013-04-23 13:22:14 +00:00
|
|
|
|
case 1034:
|
|
|
|
|
MODBIT(term.mode, set, MODE_8BIT);
|
|
|
|
|
break;
|
2013-10-01 18:02:24 +00:00
|
|
|
|
case 1049: /* swap screen & set/restore cursor as xterm */
|
2014-04-09 18:37:23 +00:00
|
|
|
|
if (!allowaltscreen)
|
|
|
|
|
break;
|
2013-10-01 18:02:24 +00:00
|
|
|
|
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
|
2014-04-25 14:26:54 +00:00
|
|
|
|
/* FALLTHROUGH */
|
2013-10-01 18:02:24 +00:00
|
|
|
|
case 47: /* swap screen */
|
2013-04-03 18:42:27 +00:00
|
|
|
|
case 1047:
|
|
|
|
|
if (!allowaltscreen)
|
|
|
|
|
break;
|
2012-12-10 19:45:46 +00:00
|
|
|
|
alt = IS_SET(MODE_ALTSCREEN);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (alt) {
|
2013-01-20 13:54:35 +00:00
|
|
|
|
tclearregion(0, 0, term.col-1,
|
2013-04-14 16:30:10 +00:00
|
|
|
|
term.row-1);
|
2013-01-20 13:54:35 +00:00
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (set ^ alt) /* set is always 1 or 0 */
|
2012-10-06 11:43:01 +00:00
|
|
|
|
tswapscreen();
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (*args != 1049)
|
2012-09-02 17:09:35 +00:00
|
|
|
|
break;
|
2014-04-25 14:26:54 +00:00
|
|
|
|
/* FALLTHROUGH */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
case 1048:
|
|
|
|
|
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
|
|
|
|
|
break;
|
2013-09-23 07:22:47 +00:00
|
|
|
|
case 2004: /* 2004: bracketed paste mode */
|
|
|
|
|
MODBIT(term.mode, set, MODE_BRCKTPASTE);
|
|
|
|
|
break;
|
2013-06-01 11:13:01 +00:00
|
|
|
|
/* Not implemented mouse modes. See comments there. */
|
2013-06-01 11:06:53 +00:00
|
|
|
|
case 1001: /* mouse highlight mode; can hang the
|
2013-06-01 11:13:01 +00:00
|
|
|
|
terminal by design when implemented. */
|
|
|
|
|
case 1005: /* UTF-8 mouse mode; will confuse
|
|
|
|
|
applications not supporting UTF-8
|
|
|
|
|
and luit. */
|
|
|
|
|
case 1015: /* urxvt mangled mouse mode; incompatible
|
|
|
|
|
and can be mistaken for other control
|
|
|
|
|
codes. */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
default:
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"erresc: unknown private set/reset mode %d\n",
|
|
|
|
|
*args);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (*args) {
|
2012-09-24 08:29:37 +00:00
|
|
|
|
case 0: /* Error (IGNORED) */
|
|
|
|
|
break;
|
|
|
|
|
case 2: /* KAM -- keyboard action */
|
2012-09-24 08:28:05 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_KBDLOCK);
|
|
|
|
|
break;
|
2012-09-24 08:29:37 +00:00
|
|
|
|
case 4: /* IRM -- Insertion-replacement */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_INSERT);
|
|
|
|
|
break;
|
2012-11-13 19:04:26 +00:00
|
|
|
|
case 12: /* SRM -- Send/Receive */
|
|
|
|
|
MODBIT(term.mode, !set, MODE_ECHO);
|
2012-09-24 08:29:37 +00:00
|
|
|
|
break;
|
|
|
|
|
case 20: /* LNM -- Linefeed/new line */
|
2012-09-24 08:28:35 +00:00
|
|
|
|
MODBIT(term.mode, set, MODE_CRLF);
|
|
|
|
|
break;
|
2012-09-02 17:09:35 +00:00
|
|
|
|
default:
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"erresc: unknown set/reset mode %d\n",
|
|
|
|
|
*args);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
csihandle(void)
|
|
|
|
|
{
|
2013-10-02 19:06:50 +00:00
|
|
|
|
char buf[40];
|
|
|
|
|
int len;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (csiescseq.mode[0]) {
|
2009-06-16 10:34:10 +00:00
|
|
|
|
default:
|
2010-02-08 22:16:55 +00:00
|
|
|
|
unknown:
|
2011-04-01 07:32:41 +00:00
|
|
|
|
fprintf(stderr, "erresc: unknown csi ");
|
2010-02-03 02:25:35 +00:00
|
|
|
|
csidump();
|
|
|
|
|
/* die(""); */
|
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case '@': /* ICH -- Insert <n> blank char */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tinsertblank(csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'A': /* CUU -- Cursor <n> Up */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'B': /* CUD -- Cursor <n> Down */
|
2012-11-08 16:21:24 +00:00
|
|
|
|
case 'e': /* VPR --Cursor <n> Down */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2014-01-31 19:57:09 +00:00
|
|
|
|
case 'i': /* MC -- Media Copy */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (csiescseq.arg[0]) {
|
2014-01-31 19:57:09 +00:00
|
|
|
|
case 0:
|
2014-01-31 21:25:51 +00:00
|
|
|
|
tdump();
|
|
|
|
|
break;
|
2014-01-31 19:57:09 +00:00
|
|
|
|
case 1:
|
2014-01-31 20:53:53 +00:00
|
|
|
|
tdumpline(term.c.y);
|
|
|
|
|
break;
|
2014-02-01 12:41:58 +00:00
|
|
|
|
case 2:
|
|
|
|
|
tdumpsel();
|
|
|
|
|
break;
|
2014-01-31 19:57:09 +00:00
|
|
|
|
case 4:
|
|
|
|
|
term.mode &= ~MODE_PRINT;
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
|
|
|
|
term.mode |= MODE_PRINT;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2012-10-06 19:19:56 +00:00
|
|
|
|
case 'c': /* DA -- Device Attributes */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (csiescseq.arg[0] == 0)
|
2014-08-15 13:00:48 +00:00
|
|
|
|
ttywrite(vtiden, sizeof(vtiden) - 1);
|
2012-10-06 19:19:56 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'C': /* CUF -- Cursor <n> Forward */
|
2012-11-08 16:21:24 +00:00
|
|
|
|
case 'a': /* HPR -- Cursor <n> Forward */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'D': /* CUB -- Cursor <n> Backward */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'E': /* CNL -- Cursor <n> Down and first col */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(0, term.c.y+csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'F': /* CPL -- Cursor <n> Up and first col */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(0, term.c.y-csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2012-08-29 17:59:47 +00:00
|
|
|
|
case 'g': /* TBC -- Tabulation clear */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (csiescseq.arg[0]) {
|
2012-08-29 17:59:47 +00:00
|
|
|
|
case 0: /* clear current tab stop */
|
|
|
|
|
term.tabs[term.c.x] = 0;
|
|
|
|
|
break;
|
|
|
|
|
case 3: /* clear all the tabs */
|
|
|
|
|
memset(term.tabs, 0, term.col * sizeof(*term.tabs));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto unknown;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'G': /* CHA -- Move to <col> */
|
2012-09-04 19:56:55 +00:00
|
|
|
|
case '`': /* HPA */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tmoveto(csiescseq.arg[0]-1, term.c.y);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'H': /* CUP -- Move to <row> <col> */
|
2012-09-04 19:56:55 +00:00
|
|
|
|
case 'f': /* HVP */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
DEFAULT(csiescseq.arg[1], 1);
|
2012-11-08 16:21:10 +00:00
|
|
|
|
tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2012-08-29 18:05:25 +00:00
|
|
|
|
case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
2014-04-23 19:12:45 +00:00
|
|
|
|
tputtab(csiescseq.arg[0]);
|
2012-08-29 18:05:25 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'J': /* ED -- Clear screen */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selclear();
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (csiescseq.arg[0]) {
|
2010-02-03 02:25:35 +00:00
|
|
|
|
case 0: /* below */
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.y < term.row-1) {
|
2013-01-20 13:54:35 +00:00
|
|
|
|
tclearregion(0, term.c.y+1, term.col-1,
|
2013-04-14 16:30:10 +00:00
|
|
|
|
term.row-1);
|
2013-01-20 13:54:35 +00:00
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
break;
|
2010-02-03 02:25:35 +00:00
|
|
|
|
case 1: /* above */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.y > 1)
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(0, 0, term.col-1, term.c.y-1);
|
|
|
|
|
tclearregion(0, term.c.y, term.c.x, term.c.y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
break;
|
2010-02-03 02:25:35 +00:00
|
|
|
|
case 2: /* all */
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(0, 0, term.col-1, term.row-1);
|
2010-02-08 22:16:55 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto unknown;
|
2010-02-03 02:25:35 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'K': /* EL -- Clear line */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (csiescseq.arg[0]) {
|
2010-02-03 02:25:35 +00:00
|
|
|
|
case 0: /* right */
|
2013-01-20 13:54:35 +00:00
|
|
|
|
tclearregion(term.c.x, term.c.y, term.col-1,
|
2013-04-14 16:30:10 +00:00
|
|
|
|
term.c.y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
break;
|
2010-02-03 02:25:35 +00:00
|
|
|
|
case 1: /* left */
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(0, term.c.y, term.c.x, term.c.y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
break;
|
2010-02-03 02:25:35 +00:00
|
|
|
|
case 2: /* all */
|
2013-04-14 16:30:10 +00:00
|
|
|
|
tclearregion(0, term.c.y, term.col-1, term.c.y);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
break;
|
2010-02-03 02:25:35 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2010-03-11 22:50:50 +00:00
|
|
|
|
case 'S': /* SU -- Scroll <n> line up */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tscrollup(term.top, csiescseq.arg[0]);
|
2010-03-11 22:50:50 +00:00
|
|
|
|
break;
|
|
|
|
|
case 'T': /* SD -- Scroll <n> line down */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tscrolldown(term.top, csiescseq.arg[0]);
|
2010-03-11 22:50:50 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'L': /* IL -- Insert <n> blank lines */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tinsertblankline(csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'l': /* RM -- Reset Mode */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'M': /* DL -- Delete <n> lines */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tdeleteline(csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-21 13:14:58 +00:00
|
|
|
|
case 'X': /* ECH -- Erase <n> char */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
2013-01-27 16:48:01 +00:00
|
|
|
|
tclearregion(term.c.x, term.c.y,
|
2013-04-14 16:30:10 +00:00
|
|
|
|
term.c.x + csiescseq.arg[0] - 1, term.c.y);
|
2010-02-21 13:14:58 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'P': /* DCH -- Delete <n> char */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
tdeletechar(csiescseq.arg[0]);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2012-08-30 19:17:54 +00:00
|
|
|
|
case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
|
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
2014-04-23 19:12:45 +00:00
|
|
|
|
tputtab(-csiescseq.arg[0]);
|
2012-08-30 19:17:54 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'd': /* VPA -- Move to <row> */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
2012-11-08 16:21:10 +00:00
|
|
|
|
tmoveato(term.c.x, csiescseq.arg[0]-1);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'h': /* SM -- Set terminal mode */
|
2012-09-02 17:09:35 +00:00
|
|
|
|
tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'm': /* SGR -- Terminal attribute (color) */
|
2012-08-29 21:14:20 +00:00
|
|
|
|
tsetattr(csiescseq.arg, csiescseq.narg);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2013-10-01 18:01:15 +00:00
|
|
|
|
case 'n': /* DSR – Device Status Report (cursor position) */
|
|
|
|
|
if (csiescseq.arg[0] == 6) {
|
2013-10-02 19:06:50 +00:00
|
|
|
|
len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
|
|
|
|
|
term.c.y+1, term.c.x+1);
|
2013-10-01 18:01:15 +00:00
|
|
|
|
ttywrite(buf, len);
|
|
|
|
|
}
|
2014-04-26 07:30:53 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'r': /* DECSTBM -- Set Scrolling Region */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (csiescseq.priv) {
|
2010-02-03 15:18:04 +00:00
|
|
|
|
goto unknown;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
} else {
|
2012-08-29 21:14:20 +00:00
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
DEFAULT(csiescseq.arg[1], term.row);
|
|
|
|
|
tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
|
2012-11-08 16:21:10 +00:00
|
|
|
|
tmoveato(0, 0);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
|
|
|
|
|
tcursor(CURSOR_SAVE);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2010-02-08 22:16:55 +00:00
|
|
|
|
case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
|
|
|
|
|
tcursor(CURSOR_LOAD);
|
2010-02-03 02:25:35 +00:00
|
|
|
|
break;
|
2015-03-18 20:12:47 +00:00
|
|
|
|
case ' ':
|
|
|
|
|
switch (csiescseq.mode[1]) {
|
2015-10-05 18:48:24 +00:00
|
|
|
|
case 'q': /* DECSCUSR -- Set Cursor Style */
|
|
|
|
|
DEFAULT(csiescseq.arg[0], 1);
|
|
|
|
|
if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
|
2015-03-18 20:12:47 +00:00
|
|
|
|
goto unknown;
|
2015-10-05 18:48:24 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.cursor = csiescseq.arg[0];
|
2015-10-05 18:48:24 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto unknown;
|
2015-03-18 20:12:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
csidump(void)
|
|
|
|
|
{
|
2012-02-15 23:58:16 +00:00
|
|
|
|
int i;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
uint c;
|
|
|
|
|
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "ESC[");
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < csiescseq.len; i++) {
|
2012-10-06 07:58:45 +00:00
|
|
|
|
c = csiescseq.buf[i] & 0xff;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (isprint(c)) {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
putc(c, stderr);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (c == '\n') {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(\\n)");
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (c == '\r') {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(\\r)");
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (c == 0x1b) {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(\\e)");
|
2012-10-06 07:58:45 +00:00
|
|
|
|
} else {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(%02x)", c);
|
2012-10-06 07:58:45 +00:00
|
|
|
|
}
|
2012-02-15 23:58:16 +00:00
|
|
|
|
}
|
2016-11-11 16:45:52 +00:00
|
|
|
|
putc('\n', stderr);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
csireset(void)
|
|
|
|
|
{
|
2012-08-29 21:14:20 +00:00
|
|
|
|
memset(&csiescseq, 0, sizeof(csiescseq));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
strhandle(void)
|
|
|
|
|
{
|
2013-02-19 17:39:13 +00:00
|
|
|
|
char *p = NULL;
|
2014-01-31 16:04:18 +00:00
|
|
|
|
int j, narg, par;
|
2012-08-29 21:14:20 +00:00
|
|
|
|
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
term.esc &= ~(ESC_STR_END|ESC_STR);
|
2012-08-30 19:19:53 +00:00
|
|
|
|
strparse();
|
2015-04-23 15:55:41 +00:00
|
|
|
|
par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
|
2012-08-29 21:14:20 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (strescseq.type) {
|
2012-08-29 21:14:20 +00:00
|
|
|
|
case ']': /* OSC -- Operating System Command */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (par) {
|
2013-02-19 17:39:13 +00:00
|
|
|
|
case 0:
|
|
|
|
|
case 1:
|
|
|
|
|
case 2:
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (narg > 1)
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsettitle(strescseq.args[1]);
|
2014-01-31 16:04:18 +00:00
|
|
|
|
return;
|
2013-02-19 17:39:13 +00:00
|
|
|
|
case 4: /* color set */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (narg < 3)
|
2013-02-19 17:39:13 +00:00
|
|
|
|
break;
|
|
|
|
|
p = strescseq.args[2];
|
2014-04-25 14:26:54 +00:00
|
|
|
|
/* FALLTHROUGH */
|
2013-02-19 17:39:13 +00:00
|
|
|
|
case 104: /* color reset, here p = NULL */
|
2013-02-23 20:17:25 +00:00
|
|
|
|
j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (wlsetcolorname(j, p)) {
|
2013-02-19 17:39:13 +00:00
|
|
|
|
fprintf(stderr, "erresc: invalid color %s\n", p);
|
2013-02-23 20:17:25 +00:00
|
|
|
|
} else {
|
2013-02-23 20:44:06 +00:00
|
|
|
|
/*
|
|
|
|
|
* TODO if defaultbg color is changed, borders
|
|
|
|
|
* are dirty
|
|
|
|
|
*/
|
2015-02-14 23:34:03 +00:00
|
|
|
|
redraw();
|
2013-02-19 17:39:13 +00:00
|
|
|
|
}
|
2014-01-31 16:04:18 +00:00
|
|
|
|
return;
|
2012-08-29 21:14:20 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2012-09-12 11:00:39 +00:00
|
|
|
|
case 'k': /* old title set compatibility */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsettitle(strescseq.args[0]);
|
2014-01-31 16:04:18 +00:00
|
|
|
|
return;
|
2014-04-25 14:27:48 +00:00
|
|
|
|
case 'P': /* DCS -- Device Control String */
|
2016-09-14 06:27:32 +00:00
|
|
|
|
term.mode |= ESC_DCS;
|
2012-08-29 21:14:20 +00:00
|
|
|
|
case '_': /* APC -- Application Program Command */
|
|
|
|
|
case '^': /* PM -- Privacy Message */
|
2014-01-31 16:04:18 +00:00
|
|
|
|
return;
|
2012-08-29 21:14:20 +00:00
|
|
|
|
}
|
2014-01-31 16:04:18 +00:00
|
|
|
|
|
|
|
|
|
fprintf(stderr, "erresc: unknown str ");
|
|
|
|
|
strdump();
|
2012-08-29 21:14:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
strparse(void)
|
|
|
|
|
{
|
2015-03-20 06:46:59 +00:00
|
|
|
|
int c;
|
2013-02-26 20:43:40 +00:00
|
|
|
|
char *p = strescseq.buf;
|
2013-02-25 12:36:40 +00:00
|
|
|
|
|
2013-02-26 20:43:40 +00:00
|
|
|
|
strescseq.narg = 0;
|
2013-02-26 17:19:44 +00:00
|
|
|
|
strescseq.buf[strescseq.len] = '\0';
|
2015-03-20 06:46:59 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (*p == '\0')
|
2015-03-20 06:46:59 +00:00
|
|
|
|
return;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (strescseq.narg < STR_ARG_SIZ) {
|
2015-03-20 06:46:59 +00:00
|
|
|
|
strescseq.args[strescseq.narg++] = p;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while ((c = *p) != ';' && c != '\0')
|
2015-03-20 06:46:59 +00:00
|
|
|
|
++p;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (c == '\0')
|
2015-03-20 06:46:59 +00:00
|
|
|
|
return;
|
|
|
|
|
*p++ = '\0';
|
|
|
|
|
}
|
2012-08-29 21:14:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
strdump(void)
|
|
|
|
|
{
|
2012-08-29 21:14:20 +00:00
|
|
|
|
int i;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
uint c;
|
|
|
|
|
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "ESC%c", strescseq.type);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < strescseq.len; i++) {
|
2012-10-06 07:58:45 +00:00
|
|
|
|
c = strescseq.buf[i] & 0xff;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (c == '\0') {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
putc('\n', stderr);
|
2013-02-26 17:19:44 +00:00
|
|
|
|
return;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (isprint(c)) {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
putc(c, stderr);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (c == '\n') {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(\\n)");
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (c == '\r') {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(\\r)");
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (c == 0x1b) {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(\\e)");
|
2012-10-06 07:58:45 +00:00
|
|
|
|
} else {
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "(%02x)", c);
|
2012-10-06 07:58:45 +00:00
|
|
|
|
}
|
2012-08-29 21:14:20 +00:00
|
|
|
|
}
|
2016-11-11 16:45:52 +00:00
|
|
|
|
fprintf(stderr, "ESC\\\n");
|
2012-08-29 21:14:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
strreset(void)
|
|
|
|
|
{
|
2012-08-29 21:14:20 +00:00
|
|
|
|
memset(&strescseq, 0, sizeof(strescseq));
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-09-08 10:10:11 +00:00
|
|
|
|
void
|
|
|
|
|
sendbreak(const Arg *arg)
|
|
|
|
|
{
|
|
|
|
|
if (tcsendbreak(cmdfd, 0))
|
|
|
|
|
perror("Error sending break");
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-31 20:53:53 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tprinter(char *s, size_t len)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (iofd != -1 && xwrite(iofd, s, len) < 0) {
|
2014-01-31 20:53:53 +00:00
|
|
|
|
fprintf(stderr, "Error writing in %s:%s\n",
|
|
|
|
|
opt_io, strerror(errno));
|
|
|
|
|
close(iofd);
|
|
|
|
|
iofd = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-08 14:22:18 +00:00
|
|
|
|
void
|
|
|
|
|
iso14755(const Arg *arg)
|
|
|
|
|
{
|
|
|
|
|
FILE *p;
|
|
|
|
|
char *us, *e, codepoint[9], uc[UTF_SIZ];
|
|
|
|
|
unsigned long utf32;
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!(p = popen(ISO14755CMD, "r")))
|
2016-10-08 14:22:18 +00:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
us = fgets(codepoint, sizeof(codepoint), p);
|
|
|
|
|
pclose(p);
|
|
|
|
|
|
|
|
|
|
if (!us || *us == '\0' || *us == '-' || strlen(us) > 7)
|
|
|
|
|
return;
|
|
|
|
|
if ((utf32 = strtoul(us, &e, 16)) == ULONG_MAX ||
|
|
|
|
|
(*e != '\n' && *e != '\0'))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
ttysend(uc, utf8encode(utf32, uc));
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-31 22:05:42 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
toggleprinter(const Arg *arg)
|
|
|
|
|
{
|
2014-01-31 22:05:42 +00:00
|
|
|
|
term.mode ^= MODE_PRINT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
printscreen(const Arg *arg)
|
|
|
|
|
{
|
2014-01-31 22:05:42 +00:00
|
|
|
|
tdump();
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-01 12:41:58 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
printsel(const Arg *arg)
|
|
|
|
|
{
|
2014-02-01 12:41:58 +00:00
|
|
|
|
tdumpsel();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdumpsel(void)
|
|
|
|
|
{
|
2014-02-01 12:41:58 +00:00
|
|
|
|
char *ptr;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((ptr = getsel())) {
|
2014-03-26 22:58:27 +00:00
|
|
|
|
tprinter(ptr, strlen(ptr));
|
|
|
|
|
free(ptr);
|
|
|
|
|
}
|
2014-02-01 12:41:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-01-31 20:53:53 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdumpline(int n)
|
|
|
|
|
{
|
2015-04-21 21:29:01 +00:00
|
|
|
|
char buf[UTF_SIZ];
|
2014-01-31 20:53:53 +00:00
|
|
|
|
Glyph *bp, *end;
|
|
|
|
|
|
|
|
|
|
bp = &term.line[n][0];
|
2014-06-27 07:15:56 +00:00
|
|
|
|
end = &bp[MIN(tlinelen(n), term.col) - 1];
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (bp != end || bp->u != ' ') {
|
|
|
|
|
for ( ;bp <= end; ++bp)
|
2015-04-21 21:29:01 +00:00
|
|
|
|
tprinter(buf, utf8encode(bp->u, buf));
|
2014-01-31 20:53:53 +00:00
|
|
|
|
}
|
|
|
|
|
tprinter("\n", 1);
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-31 21:25:51 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdump(void)
|
|
|
|
|
{
|
2014-01-31 21:25:51 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < term.row; ++i)
|
2014-01-31 21:25:51 +00:00
|
|
|
|
tdumpline(i);
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-13 23:03:17 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tputtab(int n)
|
|
|
|
|
{
|
2012-09-19 14:03:16 +00:00
|
|
|
|
uint x = term.c.x;
|
2012-08-29 17:59:43 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (n > 0) {
|
|
|
|
|
while (x < term.col && n--)
|
|
|
|
|
for (++x; x < term.col && !term.tabs[x]; ++x)
|
2014-04-23 19:12:45 +00:00
|
|
|
|
/* nothing */ ;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (n < 0) {
|
|
|
|
|
while (x > 0 && n++)
|
|
|
|
|
for (--x; x > 0 && !term.tabs[x]; --x)
|
2014-04-23 19:12:45 +00:00
|
|
|
|
/* nothing */ ;
|
2012-08-30 19:17:54 +00:00
|
|
|
|
}
|
2015-04-13 12:03:35 +00:00
|
|
|
|
term.c.x = LIMIT(x, 0, term.col-1);
|
2009-05-13 23:03:17 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-13 19:04:26 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
techo(Rune u)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (ISCONTROL(u)) { /* control code */
|
|
|
|
|
if (u & 0x80) {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
u &= 0x7f;
|
|
|
|
|
tputc('^');
|
|
|
|
|
tputc('[');
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (u != '\n' && u != '\r' && u != '\t') {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
u ^= 0x40;
|
|
|
|
|
tputc('^');
|
2012-11-13 19:04:26 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tputc(u);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
needdraw = true;
|
2012-11-13 19:04:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-09-13 12:01:18 +00:00
|
|
|
|
void
|
|
|
|
|
tdefutf8(char ascii)
|
|
|
|
|
{
|
|
|
|
|
if (ascii == 'G')
|
|
|
|
|
term.mode |= MODE_UTF8;
|
|
|
|
|
else if (ascii == '@')
|
|
|
|
|
term.mode &= ~MODE_UTF8;
|
|
|
|
|
}
|
|
|
|
|
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdeftran(char ascii)
|
|
|
|
|
{
|
2014-06-07 11:23:45 +00:00
|
|
|
|
static char cs[] = "0B";
|
|
|
|
|
static int vcs[] = {CS_GRAPHIC0, CS_USA};
|
|
|
|
|
char *p;
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if ((p = strchr(cs, ascii)) == NULL) {
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
|
2014-06-07 11:49:04 +00:00
|
|
|
|
} else {
|
2014-06-07 11:23:45 +00:00
|
|
|
|
term.trantbl[term.icharset] = vcs[p - cs];
|
2014-06-07 11:49:04 +00:00
|
|
|
|
}
|
Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.
st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.
This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.
This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-01 19:23:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-20 07:56:24 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tdectest(char c)
|
|
|
|
|
{
|
2014-08-20 07:56:24 +00:00
|
|
|
|
int x, y;
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (c == '8') { /* DEC screen alignment test. */
|
|
|
|
|
for (x = 0; x < term.col; ++x) {
|
|
|
|
|
for (y = 0; y < term.row; ++y)
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tsetchar('E', &term.c.attr, x, y);
|
2014-08-20 07:56:24 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-20 07:51:18 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tstrsequence(uchar c)
|
|
|
|
|
{
|
2016-09-14 06:27:32 +00:00
|
|
|
|
strreset();
|
|
|
|
|
|
2015-04-13 12:34:23 +00:00
|
|
|
|
switch (c) {
|
|
|
|
|
case 0x90: /* DCS -- Device Control String */
|
|
|
|
|
c = 'P';
|
2016-09-14 06:27:32 +00:00
|
|
|
|
term.esc |= ESC_DCS;
|
2015-04-13 12:34:23 +00:00
|
|
|
|
break;
|
|
|
|
|
case 0x9f: /* APC -- Application Program Command */
|
|
|
|
|
c = '_';
|
|
|
|
|
break;
|
|
|
|
|
case 0x9e: /* PM -- Privacy Message */
|
|
|
|
|
c = '^';
|
|
|
|
|
break;
|
|
|
|
|
case 0x9d: /* OSC -- Operating System Command */
|
|
|
|
|
c = ']';
|
|
|
|
|
break;
|
2014-06-20 07:51:18 +00:00
|
|
|
|
}
|
|
|
|
|
strescseq.type = c;
|
|
|
|
|
term.esc |= ESC_STR;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-29 07:58:55 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tcontrolcode(uchar ascii)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (ascii) {
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\t': /* HT */
|
|
|
|
|
tputtab(1);
|
2014-05-09 08:23:53 +00:00
|
|
|
|
return;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\b': /* BS */
|
|
|
|
|
tmoveto(term.c.x-1, term.c.y);
|
2014-05-09 08:23:53 +00:00
|
|
|
|
return;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\r': /* CR */
|
|
|
|
|
tmoveto(0, term.c.y);
|
2014-05-09 08:23:53 +00:00
|
|
|
|
return;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\f': /* LF */
|
|
|
|
|
case '\v': /* VT */
|
|
|
|
|
case '\n': /* LF */
|
|
|
|
|
/* go to first col if the mode is set */
|
|
|
|
|
tnewline(IS_SET(MODE_CRLF));
|
2014-05-09 08:23:53 +00:00
|
|
|
|
return;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\a': /* BEL */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.esc & ESC_STR_END) {
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
/* backwards compatibility to xterm */
|
|
|
|
|
strhandle();
|
|
|
|
|
} else {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!(wl.state & WIN_FOCUSED))
|
|
|
|
|
wlseturgency(1);
|
|
|
|
|
/* XXX: No bell on wayland
|
|
|
|
|
* if (bellvolume)
|
|
|
|
|
* XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
|
|
|
|
|
*/
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '\033': /* ESC */
|
|
|
|
|
csireset();
|
|
|
|
|
term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
|
|
|
|
|
term.esc |= ESC_START;
|
2014-04-29 07:58:55 +00:00
|
|
|
|
return;
|
2014-10-08 08:30:20 +00:00
|
|
|
|
case '\016': /* SO (LS1 -- Locking shift 1) */
|
|
|
|
|
case '\017': /* SI (LS0 -- Locking shift 0) */
|
|
|
|
|
term.charset = 1 - (ascii - '\016');
|
2014-05-09 08:23:53 +00:00
|
|
|
|
return;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\032': /* SUB */
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tsetchar('?', &term.c.attr, term.c.x, term.c.y);
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case '\030': /* CAN */
|
|
|
|
|
csireset();
|
|
|
|
|
break;
|
|
|
|
|
case '\005': /* ENQ (IGNORED) */
|
|
|
|
|
case '\000': /* NUL (IGNORED) */
|
|
|
|
|
case '\021': /* XON (IGNORED) */
|
|
|
|
|
case '\023': /* XOFF (IGNORED) */
|
|
|
|
|
case 0177: /* DEL (IGNORED) */
|
2014-05-09 08:23:53 +00:00
|
|
|
|
return;
|
2015-08-31 13:26:21 +00:00
|
|
|
|
case 0x80: /* TODO: PAD */
|
|
|
|
|
case 0x81: /* TODO: HOP */
|
|
|
|
|
case 0x82: /* TODO: BPH */
|
|
|
|
|
case 0x83: /* TODO: NBH */
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case 0x84: /* TODO: IND */
|
2014-06-20 07:51:18 +00:00
|
|
|
|
break;
|
|
|
|
|
case 0x85: /* NEL -- Next line */
|
|
|
|
|
tnewline(1); /* always go to first col */
|
|
|
|
|
break;
|
2015-08-31 13:26:21 +00:00
|
|
|
|
case 0x86: /* TODO: SSA */
|
|
|
|
|
case 0x87: /* TODO: ESA */
|
|
|
|
|
break;
|
2014-06-20 07:51:18 +00:00
|
|
|
|
case 0x88: /* HTS -- Horizontal tab stop */
|
|
|
|
|
term.tabs[term.c.x] = 1;
|
|
|
|
|
break;
|
2015-08-31 13:26:21 +00:00
|
|
|
|
case 0x89: /* TODO: HTJ */
|
|
|
|
|
case 0x8a: /* TODO: VTS */
|
|
|
|
|
case 0x8b: /* TODO: PLD */
|
|
|
|
|
case 0x8c: /* TODO: PLU */
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case 0x8d: /* TODO: RI */
|
|
|
|
|
case 0x8e: /* TODO: SS2 */
|
|
|
|
|
case 0x8f: /* TODO: SS3 */
|
2015-08-31 13:26:21 +00:00
|
|
|
|
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 */
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case 0x98: /* TODO: SOS */
|
2015-08-31 13:26:21 +00:00
|
|
|
|
case 0x99: /* TODO: SGCI */
|
2014-06-20 07:51:18 +00:00
|
|
|
|
break;
|
|
|
|
|
case 0x9a: /* DECID -- Identify Terminal */
|
2014-08-15 13:00:48 +00:00
|
|
|
|
ttywrite(vtiden, sizeof(vtiden) - 1);
|
2014-06-20 07:51:18 +00:00
|
|
|
|
break;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
case 0x9b: /* TODO: CSI */
|
|
|
|
|
case 0x9c: /* TODO: ST */
|
|
|
|
|
break;
|
2014-06-20 07:51:18 +00:00
|
|
|
|
case 0x90: /* DCS -- Device Control String */
|
|
|
|
|
case 0x9d: /* OSC -- Operating System Command */
|
2015-08-31 13:26:21 +00:00
|
|
|
|
case 0x9e: /* PM -- Privacy Message */
|
|
|
|
|
case 0x9f: /* APC -- Application Program Command */
|
2014-06-20 07:51:18 +00:00
|
|
|
|
tstrsequence(ascii);
|
|
|
|
|
return;
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
}
|
2014-05-09 08:23:53 +00:00
|
|
|
|
/* only CAN, SUB, \a and C1 chars interrupt a sequence */
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
term.esc &= ~(ESC_STR_END|ESC_STR);
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-20 07:56:24 +00:00
|
|
|
|
/*
|
|
|
|
|
* returns 1 when the sequence is finished and it hasn't to read
|
|
|
|
|
* more characters for this sequence, otherwise 0
|
|
|
|
|
*/
|
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
eschandle(uchar ascii)
|
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
switch (ascii) {
|
2014-08-20 07:56:24 +00:00
|
|
|
|
case '[':
|
|
|
|
|
term.esc |= ESC_CSI;
|
|
|
|
|
return 0;
|
|
|
|
|
case '#':
|
|
|
|
|
term.esc |= ESC_TEST;
|
|
|
|
|
return 0;
|
2016-09-13 12:01:18 +00:00
|
|
|
|
case '%':
|
|
|
|
|
term.esc |= ESC_UTF8;
|
|
|
|
|
return 0;
|
2014-08-20 07:56:24 +00:00
|
|
|
|
case 'P': /* DCS -- Device Control String */
|
|
|
|
|
case '_': /* APC -- Application Program Command */
|
|
|
|
|
case '^': /* PM -- Privacy Message */
|
|
|
|
|
case ']': /* OSC -- Operating System Command */
|
|
|
|
|
case 'k': /* old title set compatibility */
|
|
|
|
|
tstrsequence(ascii);
|
|
|
|
|
return 0;
|
2014-10-08 09:33:36 +00:00
|
|
|
|
case 'n': /* LS2 -- Locking shift 2 */
|
|
|
|
|
case 'o': /* LS3 -- Locking shift 3 */
|
|
|
|
|
term.charset = 2 + (ascii - 'n');
|
|
|
|
|
break;
|
2014-08-20 08:41:41 +00:00
|
|
|
|
case '(': /* GZD4 -- set primary charset G0 */
|
|
|
|
|
case ')': /* G1D4 -- set secondary charset G1 */
|
|
|
|
|
case '*': /* G2D4 -- set tertiary charset G2 */
|
|
|
|
|
case '+': /* G3D4 -- set quaternary charset G3 */
|
2014-08-20 07:56:24 +00:00
|
|
|
|
term.icharset = ascii - '(';
|
|
|
|
|
term.esc |= ESC_ALTCHARSET;
|
|
|
|
|
return 0;
|
|
|
|
|
case 'D': /* IND -- Linefeed */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.y == term.bot) {
|
2014-08-20 07:56:24 +00:00
|
|
|
|
tscrollup(term.top, 1);
|
|
|
|
|
} else {
|
|
|
|
|
tmoveto(term.c.x, term.c.y+1);
|
2014-04-26 07:24:04 +00:00
|
|
|
|
}
|
2014-08-20 07:56:24 +00:00
|
|
|
|
break;
|
|
|
|
|
case 'E': /* NEL -- Next line */
|
|
|
|
|
tnewline(1); /* always go to first col */
|
|
|
|
|
break;
|
|
|
|
|
case 'H': /* HTS -- Horizontal tab stop */
|
|
|
|
|
term.tabs[term.c.x] = 1;
|
|
|
|
|
break;
|
|
|
|
|
case 'M': /* RI -- Reverse index */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.y == term.top) {
|
2014-08-20 07:56:24 +00:00
|
|
|
|
tscrolldown(term.top, 1);
|
|
|
|
|
} else {
|
|
|
|
|
tmoveto(term.c.x, term.c.y-1);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'Z': /* DECID -- Identify Terminal */
|
|
|
|
|
ttywrite(vtiden, sizeof(vtiden) - 1);
|
|
|
|
|
break;
|
|
|
|
|
case 'c': /* RIS -- Reset to inital state */
|
|
|
|
|
treset();
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlresettitle();
|
|
|
|
|
wlloadcols();
|
2014-08-20 07:56:24 +00:00
|
|
|
|
break;
|
|
|
|
|
case '=': /* DECPAM -- Application keypad */
|
|
|
|
|
term.mode |= MODE_APPKEYPAD;
|
|
|
|
|
break;
|
|
|
|
|
case '>': /* DECPNM -- Normal keypad */
|
|
|
|
|
term.mode &= ~MODE_APPKEYPAD;
|
|
|
|
|
break;
|
|
|
|
|
case '7': /* DECSC -- Save Cursor */
|
|
|
|
|
tcursor(CURSOR_SAVE);
|
|
|
|
|
break;
|
|
|
|
|
case '8': /* DECRC -- Restore Cursor */
|
|
|
|
|
tcursor(CURSOR_LOAD);
|
|
|
|
|
break;
|
|
|
|
|
case '\\': /* ST -- String Terminator */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.esc & ESC_STR_END)
|
2014-08-20 07:56:24 +00:00
|
|
|
|
strhandle();
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
|
|
|
|
|
(uchar) ascii, isprint(ascii)? ascii:'.');
|
|
|
|
|
break;
|
2014-04-26 07:24:04 +00:00
|
|
|
|
}
|
2014-08-20 07:56:24 +00:00
|
|
|
|
return 1;
|
2014-04-26 07:24:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tputc(Rune u)
|
|
|
|
|
{
|
2015-04-21 21:29:15 +00:00
|
|
|
|
char c[UTF_SIZ];
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int control;
|
2015-04-21 21:29:15 +00:00
|
|
|
|
int width, len;
|
2014-04-27 08:25:15 +00:00
|
|
|
|
Glyph *gp;
|
2013-09-07 10:41:36 +00:00
|
|
|
|
|
2015-08-17 09:25:38 +00:00
|
|
|
|
control = ISCONTROL(u);
|
2016-09-14 06:27:32 +00:00
|
|
|
|
if (!IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
|
2016-09-13 12:01:18 +00:00
|
|
|
|
c[0] = u;
|
|
|
|
|
width = len = 1;
|
|
|
|
|
} else {
|
|
|
|
|
len = utf8encode(u, c);
|
|
|
|
|
if (!control && (width = wcwidth(u)) == -1) {
|
|
|
|
|
memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
|
|
|
|
|
width = 1;
|
|
|
|
|
}
|
2013-09-07 10:41:36 +00:00
|
|
|
|
}
|
2012-09-03 19:52:21 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_PRINT))
|
2014-01-31 20:53:53 +00:00
|
|
|
|
tprinter(c, len);
|
2013-01-18 18:11:25 +00:00
|
|
|
|
|
2012-10-06 17:15:30 +00:00
|
|
|
|
/*
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
* STR sequence must be checked before anything else
|
|
|
|
|
* because it uses all following characters until it
|
|
|
|
|
* receives a ESC, a SUB, a ST or any other C1 control
|
|
|
|
|
* character.
|
2012-10-06 17:15:30 +00:00
|
|
|
|
*/
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.esc & ESC_STR) {
|
|
|
|
|
if (u == '\a' || u == 030 || u == 032 || u == 033 ||
|
2016-10-31 06:54:56 +00:00
|
|
|
|
ISCONTROLC1(u)) {
|
2016-09-14 06:27:32 +00:00
|
|
|
|
term.esc &= ~(ESC_START|ESC_STR|ESC_DCS);
|
|
|
|
|
if (IS_SET(MODE_SIXEL)) {
|
|
|
|
|
/* TODO: render sixel */;
|
|
|
|
|
term.mode &= ~MODE_SIXEL;
|
|
|
|
|
return;
|
|
|
|
|
}
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
term.esc |= ESC_STR_END;
|
2016-09-14 06:27:32 +00:00
|
|
|
|
goto check_control_code;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_SIXEL)) {
|
|
|
|
|
/* TODO: implement sixel mode */
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
return;
|
2016-09-14 06:27:32 +00:00
|
|
|
|
}
|
|
|
|
|
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();
|
|
|
|
|
*/
|
Cancel DCS with SUB, CAN, ESC or any CC1 code
From http://www.vt100.net/docs/vt510-rm/chapter4:
*The VT510 ignores all following characters until it receives a
SUB, ST, or any other C1 control character.
So OSC, PM and APC sequence ends with a SUB (it cancels the sequence
and show a question mark as error), ST or any another C1 (8 bits)
code, or their C0 (7 bits) equivalent sequences (at this moment we
do not handle C1 codes, but we should). But it is also said that:
Cancel CAN
1/8 Immediately cancels an escape sequence, control sequence,
or device control string in progress. In this case, the
VT510 does not display any error character.
Escape ESC
1/11 Introduces an escape sequence. ESC also cancels any escape
sequence, control sequence, or device control string in
progress.
2014-04-25 23:34:46 +00:00
|
|
|
|
return;
|
2012-10-06 17:15:30 +00:00
|
|
|
|
}
|
2016-09-14 06:27:32 +00:00
|
|
|
|
|
|
|
|
|
memmove(&strescseq.buf[strescseq.len], c, len);
|
|
|
|
|
strescseq.len += len;
|
|
|
|
|
return;
|
2012-09-26 18:55:18 +00:00
|
|
|
|
}
|
2012-11-06 22:44:37 +00:00
|
|
|
|
|
2016-09-14 06:27:32 +00:00
|
|
|
|
check_control_code:
|
2012-10-06 17:15:30 +00:00
|
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (control) {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tcontrolcode(u);
|
2014-04-29 07:58:55 +00:00
|
|
|
|
/*
|
|
|
|
|
* control codes are not shown ever
|
|
|
|
|
*/
|
|
|
|
|
return;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (term.esc & ESC_START) {
|
|
|
|
|
if (term.esc & ESC_CSI) {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
csiescseq.buf[csiescseq.len++] = u;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (BETWEEN(u, 0x40, 0x7E)
|
2013-02-26 20:43:40 +00:00
|
|
|
|
|| csiescseq.len >= \
|
|
|
|
|
sizeof(csiescseq.buf)-1) {
|
2010-02-03 02:25:35 +00:00
|
|
|
|
term.esc = 0;
|
2013-02-25 12:23:56 +00:00
|
|
|
|
csiparse();
|
|
|
|
|
csihandle();
|
2010-02-03 02:25:35 +00:00
|
|
|
|
}
|
2014-04-25 23:45:10 +00:00
|
|
|
|
return;
|
2016-09-13 12:01:18 +00:00
|
|
|
|
} else if (term.esc & ESC_UTF8) {
|
|
|
|
|
tdefutf8(u);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (term.esc & ESC_ALTCHARSET) {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tdeftran(u);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (term.esc & ESC_TEST) {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tdectest(u);
|
2010-06-03 21:14:37 +00:00
|
|
|
|
} else {
|
2015-04-21 21:29:15 +00:00
|
|
|
|
if (!eschandle(u))
|
2014-04-25 23:45:10 +00:00
|
|
|
|
return;
|
2014-08-20 07:56:24 +00:00
|
|
|
|
/* sequence already finished */
|
2010-02-03 02:25:35 +00:00
|
|
|
|
}
|
2014-04-25 23:45:10 +00:00
|
|
|
|
term.esc = 0;
|
2012-10-06 17:15:30 +00:00
|
|
|
|
/*
|
2012-11-15 19:57:37 +00:00
|
|
|
|
* All characters which form part of a sequence are not
|
2012-10-06 17:15:30 +00:00
|
|
|
|
* printed
|
|
|
|
|
*/
|
|
|
|
|
return;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
|
2016-10-31 06:54:56 +00:00
|
|
|
|
selclear();
|
2014-04-27 08:25:15 +00:00
|
|
|
|
|
|
|
|
|
gp = &term.line[term.c.y][term.c.x];
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
|
2014-04-27 08:25:15 +00:00
|
|
|
|
gp->mode |= ATTR_WRAP;
|
2013-04-21 11:01:16 +00:00
|
|
|
|
tnewline(1);
|
2015-01-29 23:06:43 +00:00
|
|
|
|
gp = &term.line[term.c.y][term.c.x];
|
2013-04-21 11:01:16 +00:00
|
|
|
|
}
|
2012-11-15 15:26:50 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_INSERT) && term.c.x+width < term.col)
|
2015-01-29 23:00:39 +00:00
|
|
|
|
memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
|
2012-11-15 15:26:50 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.x+width > term.col) {
|
2013-09-07 10:41:36 +00:00
|
|
|
|
tnewline(1);
|
2015-01-29 23:06:43 +00:00
|
|
|
|
gp = &term.line[term.c.y][term.c.x];
|
|
|
|
|
}
|
2013-09-07 10:41:36 +00:00
|
|
|
|
|
2015-04-21 21:29:15 +00:00
|
|
|
|
tsetchar(u, &term.c.attr, term.c.x, term.c.y);
|
2013-09-07 10:41:36 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (width == 2) {
|
2014-04-27 08:25:15 +00:00
|
|
|
|
gp->mode |= ATTR_WIDE;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.x+1 < term.col) {
|
2015-04-21 21:29:01 +00:00
|
|
|
|
gp[1].u = '\0';
|
2014-04-27 08:25:15 +00:00
|
|
|
|
gp[1].mode = ATTR_WDUMMY;
|
2013-09-07 10:41:36 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.c.x+width < term.col) {
|
2013-09-07 10:41:36 +00:00
|
|
|
|
tmoveto(term.c.x+width, term.c.y);
|
2012-11-15 15:26:50 +00:00
|
|
|
|
} else {
|
2012-10-06 17:15:30 +00:00
|
|
|
|
term.c.state |= CURSOR_WRAPNEXT;
|
2012-11-15 15:26:50 +00:00
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-27 22:03:04 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
tresize(int col, int row)
|
|
|
|
|
{
|
2013-04-15 13:13:19 +00:00
|
|
|
|
int i;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
int minrow = MIN(row, term.row);
|
|
|
|
|
int mincol = MIN(col, term.col);
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int *bp;
|
2014-04-28 22:35:22 +00:00
|
|
|
|
TCursor c;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (col < 1 || row < 1) {
|
2014-04-27 22:03:04 +00:00
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"tresize: error resizing to %dx%d\n", col, row);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-08-26 19:37:12 +00:00
|
|
|
|
|
2015-04-11 17:30:12 +00:00
|
|
|
|
/*
|
|
|
|
|
* slide screen to keep cursor where we expect it -
|
|
|
|
|
* tscrollup would work here, but we can optimize to
|
|
|
|
|
* memmove because we're freeing the earlier lines
|
|
|
|
|
*/
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i <= term.c.y - row; i++) {
|
2015-04-11 17:29:52 +00:00
|
|
|
|
free(term.line[i]);
|
|
|
|
|
free(term.alt[i]);
|
|
|
|
|
}
|
2015-04-15 08:43:06 +00:00
|
|
|
|
/* 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));
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i += row; i < term.row; i++) {
|
2009-05-27 23:33:01 +00:00
|
|
|
|
free(term.line[i]);
|
2010-08-30 14:48:18 +00:00
|
|
|
|
free(term.alt[i]);
|
|
|
|
|
}
|
2010-08-26 22:28:27 +00:00
|
|
|
|
|
|
|
|
|
/* resize to new height */
|
2012-09-12 19:25:35 +00:00
|
|
|
|
term.line = xrealloc(term.line, row * sizeof(Line));
|
|
|
|
|
term.alt = xrealloc(term.alt, row * sizeof(Line));
|
|
|
|
|
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
|
|
|
|
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
2010-08-26 22:28:27 +00:00
|
|
|
|
|
|
|
|
|
/* resize each row to new width, zero-pad if needed */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < minrow; i++) {
|
2012-09-12 19:25:35 +00:00
|
|
|
|
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
|
|
|
|
term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
|
2010-08-26 19:37:12 +00:00
|
|
|
|
}
|
2010-08-26 22:28:27 +00:00
|
|
|
|
|
|
|
|
|
/* allocate any new rows */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (/* i == minrow */; i < row; i++) {
|
2013-08-25 22:10:47 +00:00
|
|
|
|
term.line[i] = xmalloc(col * sizeof(Glyph));
|
|
|
|
|
term.alt[i] = xmalloc(col * sizeof(Glyph));
|
2010-08-30 14:48:18 +00:00
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (col > term.col) {
|
2012-10-06 07:58:45 +00:00
|
|
|
|
bp = term.tabs + term.col;
|
2012-08-29 17:59:37 +00:00
|
|
|
|
|
|
|
|
|
memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (--bp > term.tabs && !*bp)
|
2012-08-29 17:59:37 +00:00
|
|
|
|
/* nothing */ ;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
|
2012-08-29 17:59:37 +00:00
|
|
|
|
*bp = 1;
|
|
|
|
|
}
|
2010-08-29 23:35:37 +00:00
|
|
|
|
/* update terminal size */
|
2012-10-28 12:25:53 +00:00
|
|
|
|
term.col = col;
|
|
|
|
|
term.row = row;
|
2010-08-29 23:35:37 +00:00
|
|
|
|
/* reset scrolling region */
|
|
|
|
|
tsetscroll(0, row-1);
|
2012-11-08 16:21:10 +00:00
|
|
|
|
/* make use of the LIMIT in tmoveto */
|
|
|
|
|
tmoveto(term.c.x, term.c.y);
|
2014-04-27 22:16:21 +00:00
|
|
|
|
/* Clearing both screens (it makes dirty all lines) */
|
2014-04-28 22:35:22 +00:00
|
|
|
|
c = term.c;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
|
if (mincol < col && 0 < minrow) {
|
2013-04-15 13:13:19 +00:00
|
|
|
|
tclearregion(mincol, 0, col - 1, minrow - 1);
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (0 < col && minrow < row) {
|
2013-04-15 13:13:19 +00:00
|
|
|
|
tclearregion(0, minrow, col - 1, row - 1);
|
|
|
|
|
}
|
|
|
|
|
tswapscreen();
|
2014-04-24 18:35:41 +00:00
|
|
|
|
tcursor(CURSOR_LOAD);
|
2014-08-18 17:19:42 +00:00
|
|
|
|
}
|
2014-04-28 22:35:22 +00:00
|
|
|
|
term.c = c;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-10-25 19:10:41 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlresize(int col, int row)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
union wld_object object;
|
|
|
|
|
|
|
|
|
|
wl.tw = MAX(1, col * wl.cw);
|
|
|
|
|
wl.th = MAX(1, row * wl.ch);
|
2012-09-24 08:20:45 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld.oldbuffer = wld.buffer;
|
|
|
|
|
wld.buffer = wld_create_buffer(wld.ctx, wl.w, wl.h,
|
|
|
|
|
WLD_FORMAT_XRGB8888, 0);
|
|
|
|
|
wld_export(wld.buffer, WLD_WAYLAND_OBJECT_BUFFER, &object);
|
|
|
|
|
wl.buffer = object.ptr;
|
2010-10-25 19:10:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uchar
|
|
|
|
|
sixd_to_8bit(int x)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
return x == 0 ? 0 : 0x37 + 0x28 * x;
|
2013-02-19 17:39:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlloadcolor(int i, const char *name, uint32_t *color)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!name) {
|
|
|
|
|
if (BETWEEN(i, 16, 255)) { /* 256 color */
|
|
|
|
|
if (i < 6*6*6+16) { /* same colors as xterm */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
*color = 0xff << 24 | sixd_to_8bit(((i-16)/36)%6) << 16
|
|
|
|
|
| sixd_to_8bit(((i-16)/6)%6) << 8
|
|
|
|
|
| sixd_to_8bit(((i-16)/1)%6);
|
2015-04-21 07:48:33 +00:00
|
|
|
|
} else { /* greyscale */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
*color = 0xff << 24 | (0x8 + 0xa * (i-(6*6*6+16))) * 0x10101;
|
2015-04-21 07:48:33 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
return true;
|
2015-04-21 07:48:33 +00:00
|
|
|
|
} else
|
|
|
|
|
name = colorname[i];
|
|
|
|
|
}
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
return wld_lookup_named_color(name, color);
|
2015-04-21 07:48:33 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-24 11:09:14 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlloadcols(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2014-05-22 13:00:33 +00:00
|
|
|
|
int i;
|
2012-09-29 09:17:16 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < LEN(dc.col); i++)
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!wlloadcolor(i, NULL, &dc.col[i])) {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (colorname[i])
|
2015-04-21 07:48:33 +00:00
|
|
|
|
die("Could not allocate color '%s'\n", colorname[i]);
|
|
|
|
|
else
|
|
|
|
|
die("Could not allocate color %d\n", i);
|
2012-09-29 09:17:16 +00:00
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-19 17:39:13 +00:00
|
|
|
|
int
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsetcolorname(int x, const char *name)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint32_t color;
|
2014-06-01 15:08:16 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!BETWEEN(x, 0, LEN(dc.col)))
|
2014-06-01 15:08:16 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!wlloadcolor(x, name, &color))
|
2014-06-01 15:08:16 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
dc.col[x] = color;
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2014-06-01 15:08:16 +00:00
|
|
|
|
return 0;
|
2013-02-19 17:39:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static void wlloadcursor(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
char *names[] = { mouseshape, "xterm", "ibeam", "text" };
|
|
|
|
|
int i;
|
2012-09-29 09:17:16 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
cursor.theme = wl_cursor_theme_load(NULL, 32, wl.shm);
|
|
|
|
|
|
|
|
|
|
for (i = 0; !cursor.cursor && i < LEN(names); i++)
|
|
|
|
|
cursor.cursor = wl_cursor_theme_get_cursor(cursor.theme, names[i]);
|
2012-09-03 21:02:29 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
cursor.surface = wl_compositor_create_surface(wl.cmp);
|
2010-06-02 14:01:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/*
|
|
|
|
|
* Absolute coordinates.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
wlclear(int x1, int y1, int x2, int y2)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint32_t color = dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg];
|
2015-07-10 12:30:37 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_fill_rectangle(wld.renderer, color, x1, y1, x2 - x1, y2 - y1);
|
2014-04-25 20:34:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
int
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlloadfont(Font *f, FcPattern *pattern)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-11-23 18:17:59 +00:00
|
|
|
|
FcPattern *configured;
|
2012-10-28 12:25:53 +00:00
|
|
|
|
FcPattern *match;
|
2012-10-04 20:59:45 +00:00
|
|
|
|
FcResult result;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct wld_extents extents;
|
2016-10-22 14:36:10 +00:00
|
|
|
|
int wantattr, haveattr;
|
2012-10-04 20:59:45 +00:00
|
|
|
|
|
2016-11-23 18:17:59 +00:00
|
|
|
|
/*
|
|
|
|
|
* Manually configure instead of calling XftMatchFont
|
|
|
|
|
* so that we can use the configured pattern for
|
|
|
|
|
* "missing glyph" lookups.
|
|
|
|
|
*/
|
|
|
|
|
configured = FcPatternDuplicate(pattern);
|
|
|
|
|
if (!configured)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
FcConfigSubstitute(NULL, configured, FcMatchPattern);
|
2016-12-22 04:24:19 +00:00
|
|
|
|
FcDefaultSubstitute(configured);
|
2016-11-23 18:17:59 +00:00
|
|
|
|
|
|
|
|
|
match = FcFontMatch(NULL, configured, &result);
|
|
|
|
|
if (!match) {
|
|
|
|
|
FcPatternDestroy(configured);
|
2012-10-28 12:25:53 +00:00
|
|
|
|
return 1;
|
2016-11-23 18:17:59 +00:00
|
|
|
|
}
|
2012-12-28 22:52:04 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!(f->match = wld_font_open_pattern(wld.fontctx, match))) {
|
2016-11-23 18:17:59 +00:00
|
|
|
|
FcPatternDestroy(configured);
|
2012-12-28 22:52:04 +00:00
|
|
|
|
FcPatternDestroy(match);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if ((FcPatternGetInteger(pattern, "slant", 0, &wantattr) ==
|
|
|
|
|
FcResultMatch)) {
|
2016-10-22 14:36:10 +00:00
|
|
|
|
/*
|
|
|
|
|
* Check if xft was unable to find a font with the appropriate
|
|
|
|
|
* slant but gave us one anyway. Try to mitigate.
|
|
|
|
|
*/
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if ((FcPatternGetInteger(match, "slant", 0,
|
|
|
|
|
&haveattr) != FcResultMatch) || haveattr < wantattr) {
|
2016-10-22 14:36:10 +00:00
|
|
|
|
f->badslant = 1;
|
|
|
|
|
fputs("st: font slant does not match\n", stderr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if ((FcPatternGetInteger(pattern, "weight", 0, &wantattr) ==
|
|
|
|
|
FcResultMatch)) {
|
|
|
|
|
if ((FcPatternGetInteger(match, "weight", 0,
|
|
|
|
|
&haveattr) != FcResultMatch) || haveattr != wantattr) {
|
2016-10-22 14:36:10 +00:00
|
|
|
|
f->badweight = 1;
|
|
|
|
|
fputs("st: font weight does not match\n", stderr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
|
|
|
|
wld_font_text_extents(f->match, ascii_printable, &extents);
|
2016-03-08 03:26:04 +00:00
|
|
|
|
|
2013-05-11 06:54:26 +00:00
|
|
|
|
f->set = NULL;
|
2016-11-23 18:17:59 +00:00
|
|
|
|
f->pattern = configured;
|
2012-12-28 22:52:04 +00:00
|
|
|
|
|
|
|
|
|
f->ascent = f->match->ascent;
|
|
|
|
|
f->descent = f->match->descent;
|
2012-09-24 08:20:45 +00:00
|
|
|
|
f->lbearing = 0;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
f->rbearing = f->match->max_advance;
|
2012-10-04 20:59:45 +00:00
|
|
|
|
|
2013-03-10 20:16:51 +00:00
|
|
|
|
f->height = f->ascent + f->descent;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
f->width = DIVCEIL(extents.advance, strlen(ascii_printable));
|
2012-10-28 12:25:53 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
2010-11-18 00:00:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-11-20 21:24:04 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlloadfonts(char *fontstr, double fontsize)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2012-10-28 12:25:53 +00:00
|
|
|
|
FcPattern *pattern;
|
|
|
|
|
double fontval;
|
2014-06-26 10:37:06 +00:00
|
|
|
|
float ceilf(float);
|
2012-09-30 18:10:58 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (fontstr[0] == '-') {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* XXX: need XftXlfdParse equivalent */
|
|
|
|
|
pattern = NULL;
|
2012-11-02 19:07:11 +00:00
|
|
|
|
} else {
|
|
|
|
|
pattern = FcNameParse((FcChar8 *)fontstr);
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!pattern)
|
2012-10-28 12:25:53 +00:00
|
|
|
|
die("st: can't open font %s\n", fontstr);
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (fontsize > 1) {
|
2012-10-28 12:25:53 +00:00
|
|
|
|
FcPatternDel(pattern, FC_PIXEL_SIZE);
|
2013-12-17 20:14:19 +00:00
|
|
|
|
FcPatternDel(pattern, FC_SIZE);
|
2012-10-28 12:25:53 +00:00
|
|
|
|
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
|
|
|
|
|
usedfontsize = fontsize;
|
|
|
|
|
} else {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
|
2015-05-31 10:26:11 +00:00
|
|
|
|
FcResultMatch) {
|
2013-12-17 20:14:19 +00:00
|
|
|
|
usedfontsize = fontval;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
} else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
|
2015-05-31 10:26:11 +00:00
|
|
|
|
FcResultMatch) {
|
2013-12-17 20:14:19 +00:00
|
|
|
|
usedfontsize = -1;
|
2012-10-28 12:25:53 +00:00
|
|
|
|
} 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;
|
|
|
|
|
}
|
2014-09-29 13:38:21 +00:00
|
|
|
|
defaultfontsize = usedfontsize;
|
2012-10-28 12:25:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
FcConfigSubstitute(0, pattern, FcMatchPattern);
|
|
|
|
|
FcDefaultSubstitute(pattern);
|
|
|
|
|
|
|
|
|
|
if (wlloadfont(&dc.font, pattern))
|
2012-10-28 12:25:53 +00:00
|
|
|
|
die("st: can't open font %s\n", fontstr);
|
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (usedfontsize < 0) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
FcPatternGetDouble(dc.font.pattern,
|
2013-12-17 20:14:19 +00:00
|
|
|
|
FC_PIXEL_SIZE, 0, &fontval);
|
|
|
|
|
usedfontsize = fontval;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (fontsize == 0)
|
2014-09-29 13:38:21 +00:00
|
|
|
|
defaultfontsize = fontval;
|
2013-12-17 20:14:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
/* Setting character width and height. */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.cw = ceilf(dc.font.width * cwscale);
|
|
|
|
|
wl.ch = ceilf(dc.font.height * chscale);
|
2012-09-30 18:10:58 +00:00
|
|
|
|
|
2013-02-13 20:35:27 +00:00
|
|
|
|
FcPatternDel(pattern, FC_SLANT);
|
2013-02-18 17:31:29 +00:00
|
|
|
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (wlloadfont(&dc.ifont, pattern))
|
2012-10-28 12:25:53 +00:00
|
|
|
|
die("st: can't open font %s\n", fontstr);
|
|
|
|
|
|
2013-02-18 17:31:29 +00:00
|
|
|
|
FcPatternDel(pattern, FC_WEIGHT);
|
|
|
|
|
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (wlloadfont(&dc.ibfont, pattern))
|
2012-10-28 12:25:53 +00:00
|
|
|
|
die("st: can't open font %s\n", fontstr);
|
|
|
|
|
|
2013-02-18 17:31:29 +00:00
|
|
|
|
FcPatternDel(pattern, FC_SLANT);
|
|
|
|
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (wlloadfont(&dc.bfont, pattern))
|
2012-10-28 12:25:53 +00:00
|
|
|
|
die("st: can't open font %s\n", fontstr);
|
2012-09-30 18:10:58 +00:00
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
FcPatternDestroy(pattern);
|
|
|
|
|
}
|
2012-09-30 18:10:58 +00:00
|
|
|
|
|
2013-05-11 19:59:55 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlunloadfont(Font *f)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_font_close(f->match);
|
2013-05-11 19:59:55 +00:00
|
|
|
|
FcPatternDestroy(f->pattern);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (f->set)
|
2013-05-11 19:59:55 +00:00
|
|
|
|
FcFontSetDestroy(f->set);
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-28 22:52:04 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlunloadfonts(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
Improved font caching
I made a patch that improves the performance of font caching mechanism.
This is based on a funny behaviour of FontConfig: it was handling
FcCharSet in a somewhat unexpected way.
So, we are currently adding "a character" to a new FcCharSet, and then
add it to a FcPattern. However, if we toss the FcPattern to FontConfig,
it loads the entire language(charset) that contains the character we
gave. That is, we don't always have to load a new font for each unknown
character. Instead, we can reused cached fonts, and this significantly
reduces the number of calls to extremely slow FontConfig matching
functions.
One more thing. I found that, in libXft, there's a function called
XftCharExists. XftCharIndex internally calls this function, and
does more stuffs if the character does exist. Since the returned index
is never used in st, we should call XftCharExists instead of
XftCharIndex. Please note that I already made this change in the patch.
2013-07-19 05:07:02 +00:00
|
|
|
|
/* Free the loaded fonts in the font cache. */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
while (frclen > 0)
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_font_close(frc[--frclen].font);
|
2012-12-28 22:52:04 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlunloadfont(&dc.font);
|
|
|
|
|
wlunloadfont(&dc.bfont);
|
|
|
|
|
wlunloadfont(&dc.ifont);
|
|
|
|
|
wlunloadfont(&dc.ibfont);
|
2012-12-28 22:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlzoom(const Arg *arg)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2014-09-29 13:38:21 +00:00
|
|
|
|
Arg larg;
|
2014-09-29 13:40:37 +00:00
|
|
|
|
|
2015-05-31 10:26:11 +00:00
|
|
|
|
larg.f = usedfontsize + arg->f;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlzoomabs(&larg);
|
2014-09-29 13:38:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlzoomabs(const Arg *arg)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlunloadfonts();
|
|
|
|
|
wlloadfonts(usedfont, arg->f);
|
2012-10-28 12:25:53 +00:00
|
|
|
|
cresize(0, 0);
|
2016-01-30 16:54:41 +00:00
|
|
|
|
ttyresize();
|
2015-02-14 23:34:03 +00:00
|
|
|
|
redraw();
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* XXX: Should the window size be updated here because wayland doesn't
|
|
|
|
|
* have a notion of hints?
|
|
|
|
|
* xhints();
|
|
|
|
|
*/
|
2010-11-20 21:24:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-09-29 13:38:21 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlzoomreset(const Arg *arg)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2014-09-29 13:38:21 +00:00
|
|
|
|
Arg larg;
|
2014-09-29 13:40:37 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (defaultfontsize > 0) {
|
2015-05-31 10:26:11 +00:00
|
|
|
|
larg.f = defaultfontsize;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlzoomabs(&larg);
|
2014-09-29 13:38:21 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlinit(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct wl_registry *registry;
|
2010-09-11 13:59:54 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (!(wl.dpy = wl_display_connect(NULL)))
|
2009-06-16 00:23:46 +00:00
|
|
|
|
die("Can't open display\n");
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
|
|
|
|
registry = wl_display_get_registry(wl.dpy);
|
|
|
|
|
wl_registry_add_listener(registry, ®listener, NULL);
|
|
|
|
|
wld.ctx = wld_wayland_create_context(wl.dpy, WLD_ANY);
|
|
|
|
|
wld.renderer = wld_create_renderer(wld.ctx);
|
|
|
|
|
|
|
|
|
|
wl_display_roundtrip(wl.dpy);
|
|
|
|
|
|
|
|
|
|
if (!wl.shm)
|
|
|
|
|
die("Display has no SHM\n");
|
|
|
|
|
if (!wl.seat)
|
|
|
|
|
die("Display has no seat\n");
|
|
|
|
|
if (!wl.datadevmanager)
|
|
|
|
|
die("Display has no data device manager\n");
|
|
|
|
|
|
|
|
|
|
wl.keyboard = wl_seat_get_keyboard(wl.seat);
|
|
|
|
|
wl_keyboard_add_listener(wl.keyboard, &kbdlistener, NULL);
|
|
|
|
|
wl.pointer = wl_seat_get_pointer(wl.seat);
|
|
|
|
|
wl_pointer_add_listener(wl.pointer, &ptrlistener, NULL);
|
|
|
|
|
wl.datadev = wl_data_device_manager_get_data_device(wl.datadevmanager,
|
|
|
|
|
wl.seat);
|
|
|
|
|
wl_data_device_add_listener(wl.datadev, &datadevlistener, NULL);
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2012-09-10 11:39:41 +00:00
|
|
|
|
/* font */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!FcInit())
|
2012-12-28 22:52:04 +00:00
|
|
|
|
die("Could not init fontconfig.\n");
|
|
|
|
|
|
2012-11-02 18:56:02 +00:00
|
|
|
|
usedfont = (opt_font == NULL)? font : opt_font;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld.fontctx = wld_font_create_context();
|
|
|
|
|
wlloadfonts(usedfont, 0);
|
2015-07-28 09:30:14 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlloadcols();
|
|
|
|
|
wlloadcursor();
|
2015-07-28 09:30:14 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.vis = 0;
|
|
|
|
|
wl.h = 2 * borderpx + term.row * wl.ch;
|
|
|
|
|
wl.w = 2 * borderpx + term.col * wl.cw;
|
2010-12-12 12:32:13 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.surface = wl_compositor_create_surface(wl.cmp);
|
|
|
|
|
wl_surface_add_listener(wl.surface, &surflistener, NULL);
|
2011-09-16 16:03:44 +00:00
|
|
|
|
|
2017-01-25 22:10:56 +00:00
|
|
|
|
wl.xdgsurface = zxdg_shell_v6_get_xdg_surface(wl.shell, wl.surface);
|
|
|
|
|
zxdg_surface_v6_add_listener(wl.xdgsurface, &xdgsurflistener, NULL);
|
|
|
|
|
wl.xdgtoplevel = zxdg_surface_v6_get_toplevel(wl.xdgsurface);
|
|
|
|
|
zxdg_toplevel_v6_set_app_id(wl.xdgtoplevel,
|
|
|
|
|
opt_class ? opt_class : termname);
|
|
|
|
|
zxdg_toplevel_v6_add_listener(wl.xdgtoplevel, &xdgtoplevellistener,
|
|
|
|
|
NULL);
|
2013-12-11 13:10:08 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.xkb.ctx = xkb_context_new(0);
|
|
|
|
|
wlresettitle();
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/*
|
|
|
|
|
* TODO: Implement something like XftDrawGlyphFontSpec in wld, and then apply a
|
|
|
|
|
* similar patch to ae1923d27533ff46400d93765e971558201ca1ee
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
wldraws(char *s, Glyph base, int x, int y, int charlen, int bytelen)
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int winx = borderpx + x * wl.cw, winy = borderpx + y * wl.ch,
|
|
|
|
|
width = charlen * wl.cw, xp, i;
|
|
|
|
|
int frcflags, charexists;
|
|
|
|
|
int u8fl, u8fblen, u8cblen, doesexist;
|
|
|
|
|
char *u8c, *u8fs;
|
|
|
|
|
Rune unicodep;
|
2012-09-24 08:20:45 +00:00
|
|
|
|
Font *font = &dc.font;
|
2012-12-28 22:52:04 +00:00
|
|
|
|
FcResult fcres;
|
|
|
|
|
FcPattern *fcpattern, *fontpattern;
|
|
|
|
|
FcFontSet *fcsets[] = { NULL };
|
|
|
|
|
FcCharSet *fccharset;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint32_t fg, bg, temp;
|
|
|
|
|
int oneatatime;
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
frcflags = FRC_NORMAL;
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* Fallback on color display for attributes not supported by the font */
|
|
|
|
|
if (base.mode & ATTR_ITALIC && base.mode & ATTR_BOLD) {
|
|
|
|
|
if (dc.ibfont.badslant || dc.ibfont.badweight)
|
|
|
|
|
base.fg = defaultattr;
|
|
|
|
|
font = &dc.ibfont;
|
|
|
|
|
frcflags = FRC_ITALICBOLD;
|
|
|
|
|
} else if (base.mode & ATTR_ITALIC) {
|
|
|
|
|
if (dc.ifont.badslant)
|
|
|
|
|
base.fg = defaultattr;
|
|
|
|
|
font = &dc.ifont;
|
|
|
|
|
frcflags = FRC_ITALIC;
|
|
|
|
|
} else if (base.mode & ATTR_BOLD) {
|
|
|
|
|
if (dc.bfont.badweight)
|
|
|
|
|
base.fg = defaultattr;
|
|
|
|
|
font = &dc.ifont;
|
|
|
|
|
frcflags = FRC_BOLD;
|
|
|
|
|
}
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (IS_TRUECOL(base.fg)) {
|
|
|
|
|
fg = base.fg | 0xff000000;
|
|
|
|
|
} else {
|
|
|
|
|
fg = dc.col[base.fg];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (IS_TRUECOL(base.bg)) {
|
|
|
|
|
bg = base.bg | 0xff000000;
|
|
|
|
|
} 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;
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
}
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (IS_SET(MODE_REVERSE)) {
|
|
|
|
|
if (fg == dc.col[defaultfg]) {
|
|
|
|
|
fg = dc.col[defaultbg];
|
|
|
|
|
} else {
|
|
|
|
|
fg = ~(fg & 0xffffff);
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (bg == dc.col[defaultbg]) {
|
|
|
|
|
bg = dc.col[defaultfg];
|
|
|
|
|
} else {
|
|
|
|
|
bg = ~(bg & 0xffffff);
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
}
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (base.mode & ATTR_REVERSE) {
|
|
|
|
|
temp = fg;
|
|
|
|
|
fg = bg;
|
|
|
|
|
bg = temp;
|
|
|
|
|
}
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
|
|
|
|
|
fg = (fg & (0xff << 24))
|
|
|
|
|
| ((((fg >> 16) & 0xff) / 2) << 16)
|
|
|
|
|
| ((((fg >> 8) & 0xff) / 2) << 8)
|
|
|
|
|
| ((fg & 0xff) / 2);
|
|
|
|
|
}
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
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) {
|
|
|
|
|
wlclear(0, (y == 0)? 0 : winy, borderpx,
|
|
|
|
|
((y >= term.row-1)? wl.h : (winy + wl.ch)));
|
|
|
|
|
}
|
|
|
|
|
if (x + charlen >= term.col) {
|
|
|
|
|
wlclear(winx + width, (y == 0)? 0 : winy, wl.w,
|
|
|
|
|
((y >= term.row-1)? wl.h : (winy + wl.ch)));
|
|
|
|
|
}
|
|
|
|
|
if (y == 0)
|
|
|
|
|
wlclear(winx, 0, winx + width, borderpx);
|
|
|
|
|
if (y == term.row-1)
|
|
|
|
|
wlclear(winx, winy + wl.ch, winx + width, wl.h);
|
|
|
|
|
|
|
|
|
|
/* Clean up the region we want to draw to. */
|
|
|
|
|
wld_fill_rectangle(wld.renderer, bg, winx, winy, width, wl.ch);
|
|
|
|
|
|
|
|
|
|
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 != wl.cw;
|
|
|
|
|
for (;;) {
|
|
|
|
|
u8c = s;
|
|
|
|
|
u8cblen = utf8decode(s, &unicodep, UTF_SIZ);
|
|
|
|
|
s += u8cblen;
|
|
|
|
|
bytelen -= u8cblen;
|
|
|
|
|
|
|
|
|
|
doesexist = wld_font_ensure_char(font->match, unicodep);
|
|
|
|
|
if (doesexist) {
|
|
|
|
|
u8fl++;
|
|
|
|
|
u8fblen += u8cblen;
|
|
|
|
|
if (!oneatatime && bytelen > 0)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (u8fl > 0) {
|
|
|
|
|
wld_draw_text(wld.renderer,
|
|
|
|
|
font->match, fg, xp,
|
|
|
|
|
winy + font->ascent,
|
|
|
|
|
u8fs, u8fblen, NULL);
|
|
|
|
|
xp += wl.cw * u8fl;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (doesexist) {
|
|
|
|
|
if (oneatatime)
|
|
|
|
|
continue;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Search the font cache. */
|
|
|
|
|
for (i = 0; i < frclen; i++) {
|
|
|
|
|
charexists = wld_font_ensure_char(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,
|
|
|
|
|
1, 0, &fcres);
|
|
|
|
|
fcsets[0] = font->set;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Nothing was found in the cache. Now use
|
|
|
|
|
* some dozen of Fontconfig calls to get the
|
|
|
|
|
* font for one single character.
|
|
|
|
|
*
|
|
|
|
|
* Xft and fontconfig are design failures.
|
|
|
|
|
*/
|
|
|
|
|
fcpattern = FcPatternDuplicate(font->pattern);
|
|
|
|
|
fccharset = FcCharSetCreate();
|
|
|
|
|
|
|
|
|
|
FcCharSetAddChar(fccharset, unicodep);
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
FcPatternAddCharSet(fcpattern, FC_CHARSET,
|
|
|
|
|
fccharset);
|
2015-07-08 21:56:55 +00:00
|
|
|
|
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
|
|
|
|
FcConfigSubstitute(0, fcpattern,
|
|
|
|
|
FcMatchPattern);
|
|
|
|
|
FcDefaultSubstitute(fcpattern);
|
|
|
|
|
|
|
|
|
|
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
|
|
|
|
fcpattern, &fcres);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Overwrite or create the new cache entry.
|
|
|
|
|
*/
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (frclen >= LEN(frc)) {
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
frclen = LEN(frc) - 1;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_font_close(frc[frclen].font);
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
frc[frclen].unicodep = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
frc[frclen].font = wld_font_open_pattern(wld.fontctx,
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
fontpattern);
|
|
|
|
|
frc[frclen].flags = frcflags;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
frc[frclen].unicodep = unicodep;
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
i = frclen;
|
Clean up xdraws and optimize glyph drawing with non-unit kerning values
I have another patch here for review that optimizes the performance of
glyph drawing, primarily when using non-unit kerning values, and fixes a
few other minor issues. It's dependent on the earlier patch from me that
stores unicode codepoints in a Rune type, typedef'd to uint_least32_t.
This patch is a pretty big change to xdraws so your scrutiny is
appreciated.
First, some performance numbers. I used Yu-Jie Lin termfps.sh shell
script to benchmark before and after, and you can find it in the
attachments. On my Kaveri A10 7850k machine, I get the following
results:
Before Patch
============
1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.553
Frames/second: 64.352
Chars /second: 1,458,159
2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 159.286
Frames/second: 0.627
Chars /second: 10,953
After Patch
===========
3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
cwscale: 1.0, chscale: 1.0
For 273x83 100 frames.
Elapsed time : 1.544
Frames/second: 64.728
Chars /second: 1,466,690
4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true"
cwscale: 1.001, chscale: 1.001
For 239x73 100 frames.
Elapsed time : 1.955
Frames/second: 51.146
Chars /second: 892,361
As you can see, while the improvements for fonts with unit-kerning is
marginal, there's a huge ~81x performance increase with the patch when
using kerning values other than 1.0.
So what does the patch do?
The `xdraws' function would render each glyph one at a time if non-unit
kerning values were configured, and this was the primary cause of the
slow down. Xft provides a handful of functions which allow you to render
multiple characters or glyphs at time, each with a unique <x,y> position,
so it was simply a matter of massaging the data into a format that would
allow us to use one of these functions.
I've split `xdraws' up into two functions. In the first pass with
`xmakeglyphfontspecs' it will iterate over all of the glyphs in a given
row and it will build up an array of corresponding XftGlyphFontSpec
records. Much of the old logic for resolving fonts for glyphs using Xft
and fontconfig went into this function.
The second pass is done with `xrenderglyphfontspecs' which contains the
old logic for determining colors, clearing the background, and finally
rendering the array of XftGlyphFontSpec records.
There's a couple of other things that have been improved by this patch.
For instance, the UTF-32 codepoints in the Line's were being re-encoded
back into UTF-8 strings to be passed to `xdraws' which in turn would then
decode back to UTF-32 to verify that the Font contained a matching glyph
for the code point. Next, the UTF-8 string was being passed to
`XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes
back to UTF-32 and does the lookup of the glyphs all over again.
This patch gets rid of all of this redundant round-trip encoding and
decoding of characters to be rendered and only looks up the glyph index
once (per font) during the font resolution phase. So this is probably
what's responsible for the marginal improvements seen when kerning values
are kept to 1.0.
I imagine there are other performance improvements here too, not seen in
the above benchmarks, if the user has lots of non-ASCII code plane characters
on the screen, or several different fonts are being utilized during
screen redraw.
Anyway, if you see any problems, please let me know and I can fix them.
2015-05-06 03:24:00 +00:00
|
|
|
|
frclen++;
|
|
|
|
|
|
|
|
|
|
FcPatternDestroy(fcpattern);
|
|
|
|
|
FcCharSetDestroy(fccharset);
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_draw_text(wld.renderer, frc[i].font, fg,
|
|
|
|
|
xp, winy + frc[i].font->ascent,
|
|
|
|
|
u8c, u8cblen, NULL);
|
2012-12-28 22:52:04 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
xp += wl.cw * wcwidth(unicodep);
|
2013-03-29 18:01:24 +00:00
|
|
|
|
}
|
2014-03-01 10:04:03 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (base.mode & ATTR_UNDERLINE) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_fill_rectangle(wld.renderer, fg, winx, winy + font->ascent + 1,
|
2012-09-29 09:17:16 +00:00
|
|
|
|
width, 1);
|
|
|
|
|
}
|
2013-04-23 17:17:50 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (base.mode & ATTR_STRUCK) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_fill_rectangle(wld.renderer, fg, winx, winy + 2 * font->ascent / 3,
|
2014-06-21 18:32:34 +00:00
|
|
|
|
width, 1);
|
|
|
|
|
}
|
2009-10-28 13:34:22 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-04-21 21:29:01 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wldrawglyph(Glyph g, int x, int y)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
static char buf[UTF_SIZ];
|
|
|
|
|
size_t len = utf8encode(g.u, buf);
|
|
|
|
|
int width = g.mode & ATTR_WIDE ? 2 : 1;
|
2015-10-05 20:09:51 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wldraws(buf, g, x, y, width, len);
|
2015-04-21 21:29:01 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wldrawcursor(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2012-10-06 07:58:45 +00:00
|
|
|
|
static int oldx = 0, oldy = 0;
|
2015-04-21 21:29:01 +00:00
|
|
|
|
int curx;
|
2015-10-05 20:09:51 +00:00
|
|
|
|
Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
|
2015-10-05 19:06:42 +00:00
|
|
|
|
int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
uint32_t drawcol;
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2009-05-27 23:33:01 +00:00
|
|
|
|
LIMIT(oldx, 0, term.col-1);
|
2009-05-26 00:21:02 +00:00
|
|
|
|
LIMIT(oldy, 0, term.row-1);
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2013-09-07 10:41:36 +00:00
|
|
|
|
curx = term.c.x;
|
|
|
|
|
|
|
|
|
|
/* adjust position if in dummy */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.line[oldy][oldx].mode & ATTR_WDUMMY)
|
2013-09-07 10:41:36 +00:00
|
|
|
|
oldx--;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.line[term.c.y][curx].mode & ATTR_WDUMMY)
|
2013-09-07 10:41:36 +00:00
|
|
|
|
curx--;
|
|
|
|
|
|
2015-10-05 20:09:51 +00:00
|
|
|
|
/* remove the old cursor */
|
|
|
|
|
og = term.line[oldy][oldx];
|
|
|
|
|
if (ena_sel && selected(oldx, oldy))
|
|
|
|
|
og.mode ^= ATTR_REVERSE;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wldrawglyph(og, oldx, oldy);
|
|
|
|
|
if (oldx != curx || oldy != term.c.y) {
|
|
|
|
|
wl_surface_damage(wl.surface, borderpx + oldx * wl.cw,
|
|
|
|
|
borderpx + oldy * wl.ch, wl.cw, wl.ch);
|
|
|
|
|
}
|
2015-10-05 20:09:51 +00:00
|
|
|
|
|
2015-04-21 21:29:01 +00:00
|
|
|
|
g.u = term.line[term.c.y][term.c.x].u;
|
2015-10-05 22:21:44 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Select the right color for the right mode.
|
|
|
|
|
*/
|
|
|
|
|
if (IS_SET(MODE_REVERSE)) {
|
|
|
|
|
g.mode |= ATTR_REVERSE;
|
|
|
|
|
g.bg = defaultfg;
|
|
|
|
|
if (ena_sel && selected(term.c.x, term.c.y)) {
|
|
|
|
|
drawcol = dc.col[defaultcs];
|
|
|
|
|
g.fg = defaultrcs;
|
|
|
|
|
} else {
|
|
|
|
|
drawcol = dc.col[defaultrcs];
|
|
|
|
|
g.fg = defaultcs;
|
|
|
|
|
}
|
2015-10-05 20:09:51 +00:00
|
|
|
|
} else {
|
2015-10-05 22:21:44 +00:00
|
|
|
|
if (ena_sel && selected(term.c.x, term.c.y)) {
|
|
|
|
|
drawcol = dc.col[defaultrcs];
|
2015-10-06 08:29:44 +00:00
|
|
|
|
g.fg = defaultfg;
|
|
|
|
|
g.bg = defaultrcs;
|
2015-10-05 22:21:44 +00:00
|
|
|
|
} else {
|
|
|
|
|
drawcol = dc.col[defaultcs];
|
|
|
|
|
}
|
2015-10-05 20:09:51 +00:00
|
|
|
|
}
|
2012-01-21 22:14:41 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_HIDE))
|
2014-08-24 14:27:28 +00:00
|
|
|
|
return;
|
2012-02-15 18:33:48 +00:00
|
|
|
|
|
2014-08-24 14:27:28 +00:00
|
|
|
|
/* draw the new one */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (wl.state & WIN_FOCUSED) {
|
|
|
|
|
switch (wl.cursor) {
|
2015-10-05 20:59:04 +00:00
|
|
|
|
case 7: /* st extension: snowman */
|
|
|
|
|
utf8decode("☃", &g.u, UTF_SIZ);
|
2015-10-05 18:48:24 +00:00
|
|
|
|
case 0: /* Blinking Block */
|
|
|
|
|
case 1: /* Blinking Block (Default) */
|
|
|
|
|
case 2: /* Steady Block */
|
|
|
|
|
g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wldrawglyph(g, term.c.x, term.c.y);
|
2015-10-05 18:48:24 +00:00
|
|
|
|
break;
|
|
|
|
|
case 3: /* Blinking Underline */
|
|
|
|
|
case 4: /* Steady Underline */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_fill_rectangle(wld.renderer, drawcol,
|
|
|
|
|
borderpx + curx * wl.cw,
|
|
|
|
|
borderpx + (term.c.y + 1) * wl.ch - \
|
2015-10-05 20:38:19 +00:00
|
|
|
|
cursorthickness,
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.cw, cursorthickness);
|
2015-10-05 18:48:24 +00:00
|
|
|
|
break;
|
|
|
|
|
case 5: /* Blinking bar */
|
|
|
|
|
case 6: /* Steady bar */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_fill_rectangle(wld.renderer, drawcol,
|
|
|
|
|
borderpx + curx * wl.cw,
|
|
|
|
|
borderpx + term.c.y * wl.ch,
|
|
|
|
|
cursorthickness, wl.ch);
|
2015-10-05 18:48:24 +00:00
|
|
|
|
break;
|
2015-03-18 20:12:47 +00:00
|
|
|
|
}
|
2014-08-24 14:27:28 +00:00
|
|
|
|
} else {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wld_fill_rectangle(wld.renderer, drawcol,
|
|
|
|
|
borderpx + curx * wl.cw,
|
|
|
|
|
borderpx + term.c.y * wl.ch,
|
|
|
|
|
wl.cw - 1, 1);
|
|
|
|
|
wld_fill_rectangle(wld.renderer, drawcol,
|
|
|
|
|
borderpx + curx * wl.cw,
|
|
|
|
|
borderpx + term.c.y * wl.ch,
|
|
|
|
|
1, wl.ch - 1);
|
|
|
|
|
wld_fill_rectangle(wld.renderer, drawcol,
|
|
|
|
|
borderpx + (curx + 1) * wl.cw - 1,
|
|
|
|
|
borderpx + term.c.y * wl.ch,
|
|
|
|
|
1, wl.ch - 1);
|
|
|
|
|
wld_fill_rectangle(wld.renderer, drawcol,
|
|
|
|
|
borderpx + curx * wl.cw,
|
|
|
|
|
borderpx + (term.c.y + 1) * wl.ch - 1,
|
|
|
|
|
wl.cw, 1);
|
2014-08-24 14:27:28 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl_surface_damage(wl.surface, borderpx + curx * wl.cw,
|
|
|
|
|
borderpx + term.c.y * wl.ch, wl.cw, wl.ch);
|
2014-08-24 14:27:28 +00:00
|
|
|
|
oldx = curx, oldy = term.c.y;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-23 20:44:06 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsettitle(char *title)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2017-01-25 22:10:56 +00:00
|
|
|
|
zxdg_toplevel_v6_set_title(wl.xdgtoplevel, title);
|
2013-02-23 20:44:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-09-13 05:16:38 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlresettitle(void)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlsettitle(opt_title ? opt_title : "st");
|
2012-09-13 05:16:38 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-09-03 19:52:34 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
redraw(void)
|
|
|
|
|
{
|
2014-05-09 15:12:58 +00:00
|
|
|
|
tfulldirt();
|
2012-09-03 19:52:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-04-26 18:29:28 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
draw(void)
|
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int y, y0;
|
|
|
|
|
|
|
|
|
|
for (y = 0; y <= term.bot; ++y) {
|
|
|
|
|
if (!term.dirty[y])
|
|
|
|
|
continue;
|
|
|
|
|
for (y0 = y; y <= term.bot && term.dirty[y]; ++y);
|
|
|
|
|
wl_surface_damage(wl.surface, 0, borderpx + y0 * wl.ch,
|
|
|
|
|
wl.w, (y - y0) * wl.ch);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wld_set_target_buffer(wld.renderer, wld.buffer);
|
2011-04-21 22:18:53 +00:00
|
|
|
|
drawregion(0, 0, term.col, term.row);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.framecb = wl_surface_frame(wl.surface);
|
|
|
|
|
wl_callback_add_listener(wl.framecb, &framelistener, NULL);
|
|
|
|
|
wld_flush(wld.renderer);
|
|
|
|
|
wl_surface_attach(wl.surface, wl.buffer, 0, 0);
|
|
|
|
|
wl_surface_commit(wl.surface);
|
|
|
|
|
/* need to wait to destroy the old buffer until we commit the new
|
|
|
|
|
* buffer */
|
|
|
|
|
if (wld.oldbuffer) {
|
|
|
|
|
wld_buffer_unreference(wld.oldbuffer);
|
|
|
|
|
wld.oldbuffer = 0;
|
|
|
|
|
}
|
|
|
|
|
needdraw = false;
|
2011-04-21 22:18:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
drawregion(int x1, int y1, int x2, int y2)
|
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int ic, ib, x, y, ox;
|
2009-10-28 13:34:22 +00:00
|
|
|
|
Glyph base, new;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
char buf[DRAW_BUF_SIZ];
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
|
2010-08-30 21:41:37 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (y = y1; y < y2; y++) {
|
|
|
|
|
if (!term.dirty[y])
|
2011-10-20 21:20:59 +00:00
|
|
|
|
continue;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2011-10-20 21:20:59 +00:00
|
|
|
|
term.dirty[y] = 0;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
base = term.line[y][0];
|
|
|
|
|
ic = ib = ox = 0;
|
|
|
|
|
for (x = x1; x < x2; x++) {
|
2009-10-28 13:34:22 +00:00
|
|
|
|
new = term.line[y][x];
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (new.mode == ATTR_WDUMMY)
|
2013-09-07 10:41:36 +00:00
|
|
|
|
continue;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (ena_sel && selected(x, y))
|
2010-08-31 09:02:17 +00:00
|
|
|
|
new.mode ^= ATTR_REVERSE;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (ib > 0 && (ATTRCMP(base, new)
|
|
|
|
|
|| ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
|
|
|
|
|
wldraws(buf, base, ox, y, ic, ib);
|
|
|
|
|
ic = ib = 0;
|
2010-08-29 18:12:44 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (ib == 0) {
|
2013-04-15 13:13:19 +00:00
|
|
|
|
ox = x;
|
|
|
|
|
base = new;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
|
|
|
|
ib += utf8encode(new.u, buf+ib);
|
|
|
|
|
ic += (new.mode & ATTR_WIDE)? 2 : 1;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (ib > 0)
|
|
|
|
|
wldraws(buf, base, ox, y, ic, ib);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wldrawcursor();
|
2010-09-11 14:05:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlseturgency(int add)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* XXX: no urgency equivalent yet in wayland */
|
2010-08-30 01:05:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-08 21:56:55 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
match(uint mask, uint state)
|
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
return mask == MOD_MASK_ANY || mask == (state & ~(ignoremod));
|
2012-11-15 18:01:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-25 08:23:02 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
numlock(const Arg *dummy)
|
|
|
|
|
{
|
2012-11-25 08:23:02 +00:00
|
|
|
|
term.numlock ^= 1;
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-03 15:18:04 +00:00
|
|
|
|
char*
|
2016-10-31 06:54:56 +00:00
|
|
|
|
kmap(xkb_keysym_t k, uint state)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2012-11-13 19:04:45 +00:00
|
|
|
|
Key *kp;
|
2012-11-15 19:19:35 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Check for mapped keys out of X11 function keys. */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (i = 0; i < LEN(mappedkeys); i++) {
|
|
|
|
|
if (mappedkeys[i] == k)
|
2012-11-15 19:19:35 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (i == LEN(mappedkeys)) {
|
|
|
|
|
if ((k & 0xFFFF) < 0xFD00)
|
2012-11-15 19:19:35 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (kp = key; kp < key + LEN(key); kp++) {
|
|
|
|
|
if (kp->k != k)
|
2012-11-13 19:04:45 +00:00
|
|
|
|
continue;
|
2012-11-14 05:37:24 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!match(kp->mask, state))
|
2012-11-13 19:04:45 +00:00
|
|
|
|
continue;
|
2012-11-14 05:37:24 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
|
2013-10-19 13:13:13 +00:00
|
|
|
|
continue;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (term.numlock && kp->appkey == 2)
|
2012-11-13 19:04:45 +00:00
|
|
|
|
continue;
|
2012-11-14 05:37:24 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
|
2012-11-13 19:04:45 +00:00
|
|
|
|
continue;
|
2012-11-14 05:37:24 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
|
2012-11-13 19:04:45 +00:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
return kp->s;
|
2011-08-14 15:13:59 +00:00
|
|
|
|
}
|
2012-11-14 05:37:24 +00:00
|
|
|
|
|
2009-09-07 19:19:29 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
cresize(int width, int height)
|
|
|
|
|
{
|
|
|
|
|
int col, row;
|
|
|
|
|
|
|
|
|
|
if (width != 0)
|
|
|
|
|
wl.w = width;
|
|
|
|
|
if (height != 0)
|
|
|
|
|
wl.h = height;
|
|
|
|
|
|
|
|
|
|
col = (wl.w - 2 * borderpx) / wl.cw;
|
|
|
|
|
row = (wl.h - 2 * borderpx) / wl.ch;
|
|
|
|
|
|
|
|
|
|
tresize(col, row);
|
|
|
|
|
wlresize(col, row);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
regglobal(void *data, struct wl_registry *registry, uint32_t name,
|
|
|
|
|
const char *interface, uint32_t version)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp(interface, "wl_compositor") == 0) {
|
|
|
|
|
wl.cmp = wl_registry_bind(registry, name,
|
|
|
|
|
&wl_compositor_interface, 3);
|
2017-01-25 22:10:56 +00:00
|
|
|
|
} else if (strcmp(interface, "zxdg_shell_v6") == 0) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.shell = wl_registry_bind(registry, name,
|
2017-01-25 22:10:56 +00:00
|
|
|
|
&zxdg_shell_v6_interface, 1);
|
|
|
|
|
zxdg_shell_v6_add_listener(wl.shell, &xdgshelllistener, NULL);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
} else if (strcmp(interface, "wl_shm") == 0) {
|
|
|
|
|
wl.shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
|
|
|
|
|
} else if (strcmp(interface, "wl_seat") == 0) {
|
|
|
|
|
wl.seat = wl_registry_bind(registry, name,
|
|
|
|
|
&wl_seat_interface, 4);
|
|
|
|
|
} else if (strcmp(interface, "wl_data_device_manager") == 0) {
|
|
|
|
|
wl.datadevmanager = wl_registry_bind(registry, name,
|
|
|
|
|
&wl_data_device_manager_interface, 1);
|
|
|
|
|
} else if (strcmp(interface, "wl_output") == 0) {
|
|
|
|
|
/* bind to outputs so we can get surface enter events */
|
|
|
|
|
wl_registry_bind(registry, name, &wl_output_interface, 2);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
regglobalremove(void *data, struct wl_registry *registry, uint32_t name)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
surfenter(void *data, struct wl_surface *surface, struct wl_output *output)
|
|
|
|
|
{
|
|
|
|
|
wl.vis++;
|
|
|
|
|
if (!(wl.state & WIN_VISIBLE))
|
|
|
|
|
wl.state |= WIN_VISIBLE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
surfleave(void *data, struct wl_surface *surface, struct wl_output *output)
|
|
|
|
|
{
|
|
|
|
|
if (--wl.vis == 0)
|
|
|
|
|
wl.state &= ~WIN_VISIBLE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
framedone(void *data, struct wl_callback *callback, uint32_t msecs)
|
|
|
|
|
{
|
|
|
|
|
wl_callback_destroy(callback);
|
|
|
|
|
wl.framecb = NULL;
|
|
|
|
|
if (needdraw && wl.state & WIN_VISIBLE) {
|
|
|
|
|
draw();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
kbdkeymap(void *data, struct wl_keyboard *keyboard, uint32_t format, int32_t fd,
|
|
|
|
|
uint32_t size)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
char *string;
|
|
|
|
|
|
|
|
|
|
if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
|
|
|
|
|
close(fd);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
string = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
|
|
|
|
|
|
|
|
|
|
if (string == MAP_FAILED) {
|
|
|
|
|
close(fd);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl.xkb.keymap = xkb_keymap_new_from_string(wl.xkb.ctx, string,
|
|
|
|
|
XKB_KEYMAP_FORMAT_TEXT_V1, 0);
|
|
|
|
|
munmap(string, size);
|
|
|
|
|
close(fd);
|
|
|
|
|
wl.xkb.state = xkb_state_new(wl.xkb.keymap);
|
|
|
|
|
|
|
|
|
|
wl.xkb.ctrl = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_CTRL);
|
|
|
|
|
wl.xkb.alt = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_ALT);
|
|
|
|
|
wl.xkb.shift = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_SHIFT);
|
|
|
|
|
wl.xkb.logo = xkb_keymap_mod_get_index(wl.xkb.keymap, XKB_MOD_NAME_LOGO);
|
|
|
|
|
|
|
|
|
|
wl.xkb.mods = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
kbdenter(void *data, struct wl_keyboard *keyboard, uint32_t serial,
|
|
|
|
|
struct wl_surface *surface, struct wl_array *keys)
|
|
|
|
|
{
|
|
|
|
|
wl.state |= WIN_FOCUSED;
|
|
|
|
|
if (IS_SET(MODE_FOCUS))
|
|
|
|
|
ttywrite("\033[I", 3);
|
|
|
|
|
/* need to redraw the cursor */
|
|
|
|
|
needdraw = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
kbdleave(void *data, struct wl_keyboard *keyboard, uint32_t serial,
|
|
|
|
|
struct wl_surface *surface)
|
|
|
|
|
{
|
|
|
|
|
/* selection offers are invalidated when we lose keyboard focus */
|
|
|
|
|
wl.seloffer = NULL;
|
|
|
|
|
wl.state &= ~WIN_FOCUSED;
|
|
|
|
|
if (IS_SET(MODE_FOCUS))
|
|
|
|
|
ttywrite("\033[O", 3);
|
|
|
|
|
/* need to redraw the cursor */
|
|
|
|
|
needdraw = true;
|
|
|
|
|
/* disable key repeat */
|
|
|
|
|
repeat.len = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
kbdkey(void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t time,
|
|
|
|
|
uint32_t key, uint32_t state)
|
|
|
|
|
{
|
|
|
|
|
xkb_keysym_t ksym;
|
|
|
|
|
char buf[32], *str;
|
2013-10-05 09:45:17 +00:00
|
|
|
|
int len;
|
2015-05-05 20:13:21 +00:00
|
|
|
|
Rune c;
|
2012-11-15 18:01:16 +00:00
|
|
|
|
Shortcut *bp;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_KBDLOCK))
|
2012-09-24 08:28:05 +00:00
|
|
|
|
return;
|
2012-10-06 07:58:45 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (state == WL_KEYBOARD_KEY_STATE_RELEASED) {
|
|
|
|
|
if (repeat.key == key)
|
|
|
|
|
repeat.len = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ksym = xkb_state_key_get_one_sym(wl.xkb.state, key + 8);
|
|
|
|
|
len = xkb_keysym_to_utf8(ksym, buf, sizeof buf);
|
|
|
|
|
if (len > 0)
|
|
|
|
|
--len;
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
/* 1. shortcuts */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (ksym == bp->keysym && match(bp->mod, wl.xkb.mods)) {
|
2012-11-15 18:01:16 +00:00
|
|
|
|
bp->func(&(bp->arg));
|
|
|
|
|
return;
|
2012-10-28 12:25:53 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 2. custom keys from config.h */
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if ((str = kmap(ksym, wl.xkb.mods))) {
|
|
|
|
|
len = strlen(str);
|
|
|
|
|
goto send;
|
2013-10-05 09:45:44 +00:00
|
|
|
|
}
|
2012-11-13 19:04:26 +00:00
|
|
|
|
|
2013-10-05 09:45:44 +00:00
|
|
|
|
/* 3. composed string from input method */
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (len == 0)
|
2013-10-05 09:45:44 +00:00
|
|
|
|
return;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (len == 1 && wl.xkb.mods & MOD_MASK_ALT) {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (IS_SET(MODE_8BIT)) {
|
|
|
|
|
if (*buf < 0177) {
|
2013-10-05 09:45:44 +00:00
|
|
|
|
c = *buf | 0x80;
|
2015-04-21 21:28:40 +00:00
|
|
|
|
len = utf8encode(c, buf);
|
2013-04-23 13:22:14 +00:00
|
|
|
|
}
|
2013-10-05 09:45:44 +00:00
|
|
|
|
} else {
|
|
|
|
|
buf[1] = buf[0];
|
|
|
|
|
buf[0] = '\033';
|
|
|
|
|
len = 2;
|
2013-04-23 13:22:14 +00:00
|
|
|
|
}
|
2012-10-06 07:58:45 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* convert character to control character */
|
|
|
|
|
else if (len == 1 && wl.xkb.mods & MOD_MASK_CTRL) {
|
|
|
|
|
if ((*buf >= '@' && *buf < '\177') || *buf == ' ')
|
|
|
|
|
*buf &= 0x1F;
|
|
|
|
|
else if (*buf == '2') *buf = '\000';
|
|
|
|
|
else if (*buf >= '3' && *buf <= '7')
|
|
|
|
|
*buf -= ('3' - '\033');
|
|
|
|
|
else if (*buf == '8') *buf = '\177';
|
|
|
|
|
else if (*buf == '/') *buf = '_' & 0x1F;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
str = buf;
|
|
|
|
|
|
|
|
|
|
send:
|
|
|
|
|
memcpy(repeat.str, str, len);
|
|
|
|
|
repeat.key = key;
|
|
|
|
|
repeat.len = len;
|
|
|
|
|
repeat.started = false;
|
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &repeat.last);
|
|
|
|
|
ttysend(str, len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
kbdmodifiers(void *data, struct wl_keyboard *keyboard, uint32_t serial,
|
|
|
|
|
uint32_t dep, uint32_t lat, uint32_t lck, uint32_t group)
|
|
|
|
|
{
|
|
|
|
|
xkb_mod_mask_t mod_mask;
|
|
|
|
|
|
|
|
|
|
xkb_state_update_mask(wl.xkb.state, dep, lat, lck, group, 0, 0);
|
|
|
|
|
|
|
|
|
|
mod_mask = xkb_state_serialize_mods(wl.xkb.state, XKB_STATE_MODS_EFFECTIVE);
|
|
|
|
|
wl.xkb.mods = 0;
|
|
|
|
|
|
|
|
|
|
if (mod_mask & (1 << wl.xkb.ctrl))
|
|
|
|
|
wl.xkb.mods |= MOD_MASK_CTRL;
|
|
|
|
|
if (mod_mask & (1 << wl.xkb.alt))
|
|
|
|
|
wl.xkb.mods |= MOD_MASK_ALT;
|
|
|
|
|
if (mod_mask & (1 << wl.xkb.shift))
|
|
|
|
|
wl.xkb.mods |= MOD_MASK_SHIFT;
|
|
|
|
|
if (mod_mask & (1 << wl.xkb.logo))
|
|
|
|
|
wl.xkb.mods |= MOD_MASK_LOGO;
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
void
|
|
|
|
|
kbdrepeatinfo(void *data, struct wl_keyboard *keyboard, int32_t rate,
|
|
|
|
|
int32_t delay)
|
|
|
|
|
{
|
|
|
|
|
keyrepeatdelay = delay;
|
|
|
|
|
keyrepeatinterval = 1000 / rate;
|
|
|
|
|
}
|
2012-11-13 19:04:26 +00:00
|
|
|
|
|
2011-09-16 16:03:44 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
ptrenter(void *data, struct wl_pointer *pointer, uint32_t serial,
|
|
|
|
|
struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
struct wl_cursor_image *img = cursor.cursor->images[0];
|
|
|
|
|
struct wl_buffer *buffer;
|
|
|
|
|
|
|
|
|
|
wl_pointer_set_cursor(pointer, serial, cursor.surface,
|
|
|
|
|
img->hotspot_x, img->hotspot_y);
|
|
|
|
|
buffer = wl_cursor_image_get_buffer(img);
|
|
|
|
|
wl_surface_attach(cursor.surface, buffer, 0, 0);
|
|
|
|
|
wl_surface_damage(cursor.surface, 0, 0, img->width, img->height);
|
|
|
|
|
wl_surface_commit(cursor.surface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ptrleave(void *data, struct wl_pointer *pointer, uint32_t serial,
|
|
|
|
|
struct wl_surface *surface)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ptrmotion(void *data, struct wl_pointer * pointer, uint32_t serial,
|
|
|
|
|
wl_fixed_t x, wl_fixed_t y)
|
|
|
|
|
{
|
|
|
|
|
int oldey, oldex, oldsby, oldsey;
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_MOUSE)) {
|
|
|
|
|
wlmousereportmotion(x, y);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl.px = wl_fixed_to_int(x);
|
|
|
|
|
wl.py = wl_fixed_to_int(y);
|
|
|
|
|
|
|
|
|
|
if (!sel.mode)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
sel.mode = SEL_READY;
|
|
|
|
|
oldey = sel.oe.y;
|
|
|
|
|
oldex = sel.oe.x;
|
|
|
|
|
oldsby = sel.nb.y;
|
|
|
|
|
oldsey = sel.ne.y;
|
|
|
|
|
getbuttoninfo();
|
|
|
|
|
|
|
|
|
|
if (oldey != sel.oe.y || oldex != sel.oe.x)
|
|
|
|
|
tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ptrbutton(void * data, struct wl_pointer * pointer, uint32_t serial,
|
|
|
|
|
uint32_t time, uint32_t button, uint32_t state)
|
|
|
|
|
{
|
|
|
|
|
MouseShortcut *ms;
|
|
|
|
|
|
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(wl.xkb.mods & forceselmod)) {
|
|
|
|
|
wlmousereportbutton(button, state);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (state) {
|
|
|
|
|
case WL_POINTER_BUTTON_STATE_RELEASED:
|
|
|
|
|
if (button == BTN_MIDDLE) {
|
|
|
|
|
selpaste(NULL);
|
|
|
|
|
} else if (button == BTN_LEFT) {
|
|
|
|
|
if (sel.mode == SEL_READY) {
|
|
|
|
|
getbuttoninfo();
|
|
|
|
|
selcopy(serial);
|
|
|
|
|
} else
|
|
|
|
|
selclear();
|
|
|
|
|
sel.mode = SEL_IDLE;
|
|
|
|
|
tsetdirt(sel.nb.y, sel.ne.y);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case WL_POINTER_BUTTON_STATE_PRESSED:
|
|
|
|
|
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
|
|
|
|
|
if (button == ms->b && match(ms->mask, wl.xkb.mods)) {
|
|
|
|
|
ttysend(ms->s, strlen(ms->s));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2011-09-16 16:03:44 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
|
|
|
|
if (button == BTN_LEFT) {
|
|
|
|
|
/* Clear previous selection, logically and visually. */
|
|
|
|
|
selclear();
|
|
|
|
|
sel.mode = SEL_EMPTY;
|
|
|
|
|
sel.type = SEL_REGULAR;
|
|
|
|
|
sel.oe.x = sel.ob.x = x2col(wl.px);
|
|
|
|
|
sel.oe.y = sel.ob.y = y2row(wl.py);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If the user clicks below predefined timeouts
|
|
|
|
|
* specific snapping behaviour is exposed.
|
|
|
|
|
*/
|
|
|
|
|
if (time - sel.tclick2 <= tripleclicktimeout) {
|
|
|
|
|
sel.snap = SNAP_LINE;
|
|
|
|
|
} else if (time - sel.tclick1 <= doubleclicktimeout) {
|
|
|
|
|
sel.snap = SNAP_WORD;
|
|
|
|
|
} else {
|
|
|
|
|
sel.snap = 0;
|
|
|
|
|
}
|
|
|
|
|
selnormalize();
|
|
|
|
|
|
|
|
|
|
if (sel.snap != 0)
|
|
|
|
|
sel.mode = SEL_READY;
|
|
|
|
|
tsetdirt(sel.nb.y, sel.ne.y);
|
|
|
|
|
sel.tclick2 = sel.tclick1;
|
|
|
|
|
sel.tclick1 = time;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-09-16 16:03:44 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2016-10-31 06:54:56 +00:00
|
|
|
|
ptraxis(void * data, struct wl_pointer * pointer, uint32_t time, uint32_t axis,
|
|
|
|
|
wl_fixed_t value)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
Axiskey *ak;
|
|
|
|
|
int dir = value > 0 ? +1 : -1;
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (IS_SET(MODE_MOUSE) && !(wl.xkb.mods & forceselmod)) {
|
|
|
|
|
wlmousereportaxis(axis, value);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
for (ak = ashortcuts; ak < ashortcuts + LEN(ashortcuts); ak++) {
|
|
|
|
|
if (axis == ak->axis && dir == ak->dir
|
|
|
|
|
&& match(ak->mask, wl.xkb.mods)) {
|
|
|
|
|
ttysend(ak->s, strlen(ak->s));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-09-17 20:44:27 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
void
|
2017-01-25 22:10:56 +00:00
|
|
|
|
xdgshellping(void *data, struct zxdg_shell_v6 *shell, uint32_t serial)
|
|
|
|
|
{
|
|
|
|
|
zxdg_shell_v6_pong(shell, serial);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
xdgsurfconfigure(void *data, struct zxdg_surface_v6 *surf, uint32_t serial)
|
2016-10-31 06:54:56 +00:00
|
|
|
|
{
|
2017-01-25 22:10:56 +00:00
|
|
|
|
zxdg_surface_v6_ack_configure(surf, serial);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-28 12:25:53 +00:00
|
|
|
|
void
|
2017-01-25 22:10:56 +00:00
|
|
|
|
xdgtoplevelconfigure(void *data, struct zxdg_toplevel_v6 *toplevel,
|
|
|
|
|
int32_t w, int32_t h, struct wl_array *states)
|
2015-07-09 21:59:50 +00:00
|
|
|
|
{
|
2017-01-25 22:10:56 +00:00
|
|
|
|
|
|
|
|
|
enum zxdg_toplevel_v6_state *state;
|
|
|
|
|
bool visible = 0;
|
|
|
|
|
wl_array_for_each(state, states) {
|
|
|
|
|
if(*state == ZXDG_TOPLEVEL_V6_STATE_ACTIVATED) visible = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(visible)
|
|
|
|
|
wl.state |= WIN_VISIBLE;
|
|
|
|
|
else
|
|
|
|
|
wl.state &= ~WIN_VISIBLE;
|
|
|
|
|
|
|
|
|
|
if(w == wl.w && h == wl.h)
|
2012-10-28 12:25:53 +00:00
|
|
|
|
return;
|
2017-01-25 22:10:56 +00:00
|
|
|
|
cresize(w,h);
|
|
|
|
|
if(wl.configured)
|
2016-10-31 06:54:56 +00:00
|
|
|
|
ttyresize();
|
|
|
|
|
else
|
|
|
|
|
wl.configured = true;
|
|
|
|
|
}
|
2012-10-28 12:25:53 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
void
|
2017-01-25 22:10:56 +00:00
|
|
|
|
xdgtoplevelclose(void *data, struct zxdg_toplevel_v6 *toplevel)
|
2016-10-31 06:54:56 +00:00
|
|
|
|
{
|
|
|
|
|
/* Send SIGHUP to shell */
|
|
|
|
|
kill(pid, SIGHUP);
|
|
|
|
|
exit(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datadevoffer(void *data, struct wl_data_device *datadev,
|
|
|
|
|
struct wl_data_offer *offer)
|
|
|
|
|
{
|
|
|
|
|
wl_data_offer_add_listener(offer, &dataofferlistener, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datadeventer(void *data, struct wl_data_device *datadev, uint32_t serial,
|
|
|
|
|
struct wl_surface *surf, wl_fixed_t x, wl_fixed_t y,
|
|
|
|
|
struct wl_data_offer *offer)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datadevleave(void *data, struct wl_data_device *datadev)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datadevmotion(void *data, struct wl_data_device *datadev, uint32_t time,
|
|
|
|
|
wl_fixed_t x, wl_fixed_t y)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datadevdrop(void *data, struct wl_data_device *datadev)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datadevselection(void *data, struct wl_data_device *datadev,
|
|
|
|
|
struct wl_data_offer *offer)
|
|
|
|
|
{
|
|
|
|
|
if (offer && (uintptr_t) wl_data_offer_get_user_data(offer) == 1)
|
|
|
|
|
wl.seloffer = offer;
|
|
|
|
|
else
|
|
|
|
|
wl.seloffer = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dataofferoffer(void *data, struct wl_data_offer *offer, const char *mimetype)
|
|
|
|
|
{
|
|
|
|
|
/* mark the offer as usable if it supports plain text */
|
|
|
|
|
if (strncmp(mimetype, "text/plain", 10) == 0)
|
|
|
|
|
wl_data_offer_set_user_data(offer, (void *)(uintptr_t) 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datasrctarget(void *data, struct wl_data_source *source, const char *mimetype)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datasrcsend(void *data, struct wl_data_source *source, const char *mimetype,
|
|
|
|
|
int32_t fd)
|
|
|
|
|
{
|
|
|
|
|
char *buf = sel.primary;
|
|
|
|
|
int len = strlen(sel.primary);
|
|
|
|
|
ssize_t ret;
|
|
|
|
|
while ((ret = write(fd, buf, MIN(len, BUFSIZ))) > 0) {
|
|
|
|
|
len -= ret;
|
|
|
|
|
buf += ret;
|
|
|
|
|
}
|
|
|
|
|
close(fd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
datasrccancelled(void *data, struct wl_data_source *source)
|
|
|
|
|
{
|
|
|
|
|
if (sel.source == source) {
|
|
|
|
|
sel.source = NULL;
|
|
|
|
|
selclear();
|
|
|
|
|
}
|
|
|
|
|
wl_data_source_destroy(source);
|
2012-10-28 12:25:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
run(void)
|
|
|
|
|
{
|
2009-05-10 12:17:09 +00:00
|
|
|
|
fd_set rfd;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
int wlfd = wl_display_get_fd(wl.dpy), blinkset = 0;
|
2014-06-23 14:51:51 +00:00
|
|
|
|
struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
|
2016-10-31 06:54:56 +00:00
|
|
|
|
ulong msecs;
|
2013-06-23 17:05:29 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
/* Look for initial configure. */
|
|
|
|
|
wl_display_roundtrip(wl.dpy);
|
|
|
|
|
if (!wl.configured)
|
|
|
|
|
cresize(wl.w, wl.h);
|
2016-01-30 16:54:41 +00:00
|
|
|
|
ttynew();
|
|
|
|
|
ttyresize();
|
2016-10-31 06:54:56 +00:00
|
|
|
|
draw();
|
2013-06-23 17:05:29 +00:00
|
|
|
|
|
2014-06-23 14:51:51 +00:00
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &last);
|
2014-04-11 16:11:25 +00:00
|
|
|
|
lastblink = last;
|
2013-02-15 18:10:22 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
for (;;) {
|
2009-05-10 12:17:09 +00:00
|
|
|
|
FD_ZERO(&rfd);
|
|
|
|
|
FD_SET(cmdfd, &rfd);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
FD_SET(wlfd, &rfd);
|
2013-04-26 16:41:54 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (pselect(MAX(wlfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (errno == EINTR)
|
2009-07-10 15:23:11 +00:00
|
|
|
|
continue;
|
2014-04-20 11:15:40 +00:00
|
|
|
|
die("select failed: %s\n", strerror(errno));
|
2013-05-06 17:50:14 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (FD_ISSET(cmdfd, &rfd)) {
|
2013-05-06 17:50:14 +00:00
|
|
|
|
ttyread();
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (blinktimeout) {
|
2013-05-06 17:50:14 +00:00
|
|
|
|
blinkset = tattrset(ATTR_BLINK);
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!blinkset)
|
2013-07-25 23:24:16 +00:00
|
|
|
|
MODBIT(term.mode, 0, MODE_BLINK);
|
2013-04-26 16:41:54 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-05-06 17:50:14 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (FD_ISSET(wlfd, &rfd)) {
|
|
|
|
|
if (wl_display_dispatch(wl.dpy) == -1)
|
|
|
|
|
die("Connection error\n");
|
|
|
|
|
}
|
2013-05-06 17:50:14 +00:00
|
|
|
|
|
2014-06-23 14:51:51 +00:00
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
2016-10-31 06:54:56 +00:00
|
|
|
|
msecs = -1;
|
|
|
|
|
|
|
|
|
|
if (blinkset && blinktimeout) {
|
|
|
|
|
if (TIMEDIFF(now, lastblink) >= blinktimeout) {
|
|
|
|
|
tsetdirtattr(ATTR_BLINK);
|
|
|
|
|
term.mode ^= MODE_BLINK;
|
|
|
|
|
lastblink = now;
|
|
|
|
|
} else {
|
|
|
|
|
msecs = MIN(msecs, blinktimeout - \
|
|
|
|
|
TIMEDIFF(now, lastblink));
|
|
|
|
|
}
|
2013-04-26 16:41:54 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (repeat.len > 0) {
|
|
|
|
|
if (TIMEDIFF(now, repeat.last) >= \
|
|
|
|
|
(repeat.started ? keyrepeatinterval : \
|
|
|
|
|
keyrepeatdelay)) {
|
|
|
|
|
repeat.started = true;
|
|
|
|
|
repeat.last = now;
|
|
|
|
|
ttysend(repeat.str, repeat.len);
|
|
|
|
|
} else {
|
|
|
|
|
msecs = MIN(msecs, (repeat.started ? \
|
|
|
|
|
keyrepeatinterval : keyrepeatdelay) - \
|
|
|
|
|
TIMEDIFF(now, repeat.last));
|
|
|
|
|
}
|
2013-04-26 16:41:54 +00:00
|
|
|
|
}
|
2013-02-15 18:30:43 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (needdraw && wl.state & WIN_VISIBLE) {
|
|
|
|
|
if (!wl.framecb) {
|
|
|
|
|
draw();
|
2013-02-15 18:10:22 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
}
|
2013-02-15 18:10:22 +00:00
|
|
|
|
|
2016-10-31 06:54:56 +00:00
|
|
|
|
if (msecs == -1) {
|
|
|
|
|
tv = NULL;
|
|
|
|
|
} else {
|
|
|
|
|
drawtimeout.tv_nsec = 1E6 * msecs;
|
|
|
|
|
drawtimeout.tv_sec = 0;
|
|
|
|
|
tv = &drawtimeout;
|
2013-02-15 18:10:22 +00:00
|
|
|
|
}
|
2016-10-31 06:54:56 +00:00
|
|
|
|
|
|
|
|
|
wl_display_dispatch_pending(wl.dpy);
|
|
|
|
|
wl_display_flush(wl.dpy);
|
2009-05-10 12:17:09 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-03 19:00:38 +00:00
|
|
|
|
void
|
2015-07-09 21:59:50 +00:00
|
|
|
|
usage(void)
|
|
|
|
|
{
|
2016-02-01 11:20:33 +00:00
|
|
|
|
die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
|
|
|
|
|
" [-n name] [-o file]\n"
|
|
|
|
|
" [-T title] [-t title] [-w windowid]"
|
|
|
|
|
" [[-e] command [args ...]]\n"
|
|
|
|
|
" %s [-aiv] [-c class] [-f font] [-g geometry]"
|
|
|
|
|
" [-n name] [-o file]\n"
|
|
|
|
|
" [-T title] [-t title] [-w windowid] -l line"
|
|
|
|
|
" [stty_args ...]\n", argv0, argv0);
|
2016-01-29 21:02:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-05-10 12:17:09 +00:00
|
|
|
|
int
|
2015-07-09 21:59:50 +00:00
|
|
|
|
main(int argc, char *argv[])
|
|
|
|
|
{
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wl.cursor = cursorshape;
|
2012-09-02 17:43:29 +00:00
|
|
|
|
|
2013-04-03 19:00:38 +00:00
|
|
|
|
ARGBEGIN {
|
|
|
|
|
case 'a':
|
2015-07-08 21:56:55 +00:00
|
|
|
|
allowaltscreen = 0;
|
2013-04-03 19:00:38 +00:00
|
|
|
|
break;
|
|
|
|
|
case 'c':
|
|
|
|
|
opt_class = EARGF(usage());
|
|
|
|
|
break;
|
|
|
|
|
case 'e':
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (argc > 0)
|
2015-04-14 07:53:24 +00:00
|
|
|
|
--argc, ++argv;
|
2013-04-03 19:00:38 +00:00
|
|
|
|
goto run;
|
|
|
|
|
case 'f':
|
|
|
|
|
opt_font = EARGF(usage());
|
|
|
|
|
break;
|
|
|
|
|
case 'o':
|
|
|
|
|
opt_io = EARGF(usage());
|
|
|
|
|
break;
|
2015-04-13 17:03:53 +00:00
|
|
|
|
case 'l':
|
|
|
|
|
opt_line = EARGF(usage());
|
|
|
|
|
break;
|
2016-01-29 21:03:01 +00:00
|
|
|
|
case 'n':
|
|
|
|
|
opt_name = EARGF(usage());
|
|
|
|
|
break;
|
2013-04-03 19:00:38 +00:00
|
|
|
|
case 't':
|
2015-07-24 16:24:10 +00:00
|
|
|
|
case 'T':
|
2013-04-03 19:00:38 +00:00
|
|
|
|
opt_title = EARGF(usage());
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
opt_embed = EARGF(usage());
|
|
|
|
|
break;
|
|
|
|
|
case 'v':
|
2016-01-30 08:50:18 +00:00
|
|
|
|
die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0);
|
2016-01-29 21:02:40 +00:00
|
|
|
|
break;
|
2013-04-03 19:00:38 +00:00
|
|
|
|
default:
|
|
|
|
|
usage();
|
|
|
|
|
} ARGEND;
|
2011-05-14 15:47:37 +00:00
|
|
|
|
|
2012-10-06 07:58:45 +00:00
|
|
|
|
run:
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (argc > 0) {
|
2015-04-14 07:53:24 +00:00
|
|
|
|
/* eat all remaining arguments */
|
|
|
|
|
opt_cmd = argv;
|
2015-07-10 08:29:53 +00:00
|
|
|
|
if (!opt_title && !opt_line)
|
2015-04-14 07:53:24 +00:00
|
|
|
|
opt_title = basename(xstrdup(argv[0]));
|
|
|
|
|
}
|
2009-05-10 12:17:09 +00:00
|
|
|
|
setlocale(LC_CTYPE, "");
|
2015-04-09 20:04:43 +00:00
|
|
|
|
tnew(MAX(cols, 1), MAX(rows, 1));
|
2016-10-31 06:54:56 +00:00
|
|
|
|
wlinit();
|
2010-08-31 14:53:34 +00:00
|
|
|
|
selinit();
|
2009-05-27 23:33:01 +00:00
|
|
|
|
run();
|
2012-11-13 19:13:39 +00:00
|
|
|
|
|
2008-05-20 09:03:59 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2015-07-10 12:19:52 +00:00
|
|
|
|
|