diff options
author | Lauri Tirkkonen <lotheac@iki.fi> | 2019-03-13 17:15:04 +0200 |
---|---|---|
committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2019-03-15 12:25:13 +0100 |
commit | add0211522737b79dad990ccd65c8af63b5cc1dd (patch) | |
tree | a64838abc0734a24b86229e610a339ef7cd35783 /st.c | |
parent | d5efd256aa3840476579a27293ef1fb92a4b51e7 (diff) | |
download | st-patched-add0211522737b79dad990ccd65c8af63b5cc1dd.tar.bz2 st-patched-add0211522737b79dad990ccd65c8af63b5cc1dd.tar.xz st-patched-add0211522737b79dad990ccd65c8af63b5cc1dd.zip |
use iswspace()/iswpunct() to find word delimiters
this inverts the configuration logic: you no longer provide a list of
delimiters -- all space and punctuation characters are considered
delimiters, unless listed in extrawordchars.
Diffstat (limited to 'st.c')
-rw-r--r-- | st.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,6 +16,7 @@ | |||
16 | #include <termios.h> | 16 | #include <termios.h> |
17 | #include <unistd.h> | 17 | #include <unistd.h> |
18 | #include <wchar.h> | 18 | #include <wchar.h> |
19 | #include <wctype.h> | ||
19 | 20 | ||
20 | #include "st.h" | 21 | #include "st.h" |
21 | #include "win.h" | 22 | #include "win.h" |
@@ -41,7 +42,7 @@ | |||
41 | #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') | 42 | #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') |
42 | #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) | 43 | #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) |
43 | #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) | 44 | #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) |
44 | #define ISDELIM(u) (u != 0 && wcschr(worddelimiters, u) != NULL) | 45 | #define ISDELIM(u) ((iswspace(u) || iswpunct(u)) && wcschr(extrawordchars, u) == NULL) |
45 | 46 | ||
46 | enum term_mode { | 47 | enum term_mode { |
47 | MODE_WRAP = 1 << 0, | 48 | MODE_WRAP = 1 << 0, |