diff options
author | Jesse Luehrs <doy@tozt.net> | 2017-01-26 04:08:21 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2017-01-26 04:08:21 -0500 |
commit | d47bd526aa0a8c5ae2cd697f4a8294702fd96944 (patch) | |
tree | 7b616cce302523ecd0f2850be017617c4e867c84 | |
parent | 3df4d06fd663bf19f08343b0d77c20672301b9b2 (diff) | |
download | runes-d47bd526aa0a8c5ae2cd697f4a8294702fd96944.tar.gz runes-d47bd526aa0a8c5ae2cd697f4a8294702fd96944.zip |
remove the wide emoji hacks
they have been folded into modern versions of glib (>= 2.50.1) as part
of unicode 9.0.0
m--------- | libvt100 | 0 | ||||
-rw-r--r-- | src/config.c | 3 | ||||
-rw-r--r-- | src/config.h | 1 | ||||
-rw-r--r-- | src/term.c | 1 | ||||
-rw-r--r-- | src/window-xlib.c | 2 |
5 files changed, 1 insertions, 6 deletions
diff --git a/libvt100 b/libvt100 -Subproject 6776714636f32db0d02a0bdf1a6b0e2696dfd29 +Subproject 5481a0e35e3b272f333d082dc2cabcce8bc005c diff --git a/src/config.c b/src/config.c index 961e27e..31c4038 100644 --- a/src/config.c +++ b/src/config.c @@ -449,9 +449,6 @@ static void runes_config_set(RunesConfig *config, char *key, char *val) else if (!strcmp(key, "bell_is_urgent")) { config->bell_is_urgent = runes_config_parse_bool(val); } - else if (!strcmp(key, "wide_emoji")) { - config->wide_emoji = runes_config_parse_bool(val); - } else if (!strcmp(key, "bgcolor")) { cairo_pattern_t *newcolor; newcolor = runes_config_parse_color(val); diff --git a/src/config.h b/src/config.h index 7d38611..7324a10 100644 --- a/src/config.h +++ b/src/config.h @@ -27,7 +27,6 @@ struct runes_config { unsigned int bold_is_bright: 1; unsigned int bold_is_bold: 1; unsigned int audible_bell: 1; - unsigned int wide_emoji: 1; }; RunesConfig *runes_config_new(int argc, char *argv[]); @@ -24,7 +24,6 @@ RunesTerm *runes_term_new( t->scr = vt100_screen_new(t->config->default_rows, t->config->default_cols); vt100_screen_set_scrollback_length(t->scr, t->config->scrollback_length); - vt100_screen_set_wide_emoji(t->scr, t->config->scrollback_length); runes_window_create_window(t, argc, argv); runes_pty_spawn_subprocess(t, envp, cwd); diff --git a/src/window-xlib.c b/src/window-xlib.c index fde8f43..c12602f 100644 --- a/src/window-xlib.c +++ b/src/window-xlib.c @@ -1213,7 +1213,7 @@ static int runes_window_is_word_char(RunesTerm *t, int row, int col) } uc = g_utf8_get_char(c->contents); - if (vt100_char_width(uc, t->config->wide_emoji) == 0) { + if (vt100_char_width(uc) == 0) { return 0; } if (g_unichar_isspace(uc)) { |