* vt_term.c: Missing '}' is fixed.

* vt_parser.[ch]: The return value of vt_parser_write() is changed from int to size_t. * ui_display_linux.c: Compiling error in no KT_DEAD2 macro definition is fixed. * c_sixel.c: SIXEL_ORMODE is defined.
arakiken · Mar 26, 2020 · 8be829d · 8be829d
1 parent be84b20
commit 8be829d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2020-03-26  Araki Ken  <arakiken@users.sf.net>
+
+	* vt_term.c: Missing '}' is fixed.
+
+	* vt_parser.[ch]: The return value of vt_parser_write() is changed from
+	  int to size_t.
+
+	* ui_display_linux.c: Compiling error in no KT_DEAD2 macro definition is fixed.
+
+	* c_sixel.c: SIXEL_ORMODE is defined.
+
 2020-03-15  Araki Ken  <arakiken@users.sf.net>
 
 	* win32/ui.h, win32/ui_xic.c: XK_Prior - XK_Help and XK_KP_0 = VK_XXX + 0xff00.

diff --git a/common/c_sixel.c b/common/c_sixel.c
@@ -19,7 +19,7 @@
  * (See https://github.com/isaki68k/sayaka/,
  *  https://github.com/isaki68k/sayaka/blob/master/vala/sixel.native.c#L113)
  */
-#if 0
+#if 1
 #define SIXEL_ORMODE
 #endif
 

diff --git a/doc/en/ReleaseNote b/doc/en/ReleaseNote
@@ -4,6 +4,7 @@
 * Support xdg-shell on wayland.
 * Support DEC Technical character set.
 * Support input of unicode characters on mlterm-fb.
+* Support ormode of Sixel Graphics.
 * Update unicode property table (generated from UnicodeData.txt and
   EastAsianWidth.txt) to version 12.1.0.
 * Mlconfig configures files in ~/.mlterm directly if it starts without options

diff --git a/uitoolkit/fb/ui_display_linux.c b/uitoolkit/fb/ui_display_linux.c
@@ -135,7 +135,11 @@ static int kcode_to_ksym(int kcode, int *state) {
         ent.kb_value = (0xf000 - (ent.kb_value & 0xf000)) + (ent.kb_value & 0xfff) + 0x1000;
         dead = -1;
       } else {
-        if (KTYP(ent.kb_value) == KT_DEAD || KTYP(ent.kb_value) == KT_DEAD2) {
+        if (KTYP(ent.kb_value) == KT_DEAD
+#ifdef KT_DEAD2
+            || KTYP(ent.kb_value) == KT_DEAD2
+#endif
+            ) {
           dead = ent.kb_value & 0xff;
 
           return 0;

diff --git a/vtemu/vt_char_encoding.h b/vtemu/vt_char_encoding.h
@@ -87,6 +87,7 @@ typedef enum vt_char_encoding {
 
 } vt_char_encoding_t;
 
+/* VT_ISO8859_1 <= (encoding) is always true if encoding is u_int16_t (vt_parser.h) */
 #define IS_ISO8859_VARIANT(encoding) (VT_ISO8859_1 <= (encoding) && (encoding) <= VT_TCVN5712)
 
 #define IS_8BIT_ENCODING(encoding) (VT_ISO8859_1 <= (encoding) && (encoding) <= VT_CP874)

diff --git a/vtemu/vt_parser.c b/vtemu/vt_parser.c
@@ -7151,7 +7151,7 @@ int vt_parse_vt100_sequence(vt_parser_t *vt_parser) {
   return 1;
 }
 
-int vt_parser_write(vt_parser_t *vt_parser, u_char *buf, size_t len) {
+size_t vt_parser_write(vt_parser_t *vt_parser, u_char *buf, size_t len) {
   if (vt_parser->is_transferring_data) {
     return 0;
   }

diff --git a/vtemu/vt_parser.h b/vtemu/vt_parser.h
@@ -368,7 +368,7 @@ int vt_parse_vt100_sequence(vt_parser_t *vt_parser);
 #define vt_parser_has_pending_sequence(vt_parser) \
   ((vt_parser)->r_buf.left > 0 || (vt_parser)->is_transferring_data)
 
-int vt_parser_write(vt_parser_t *vt_parser, u_char *buf, size_t len);
+size_t vt_parser_write(vt_parser_t *vt_parser, u_char *buf, size_t len);
 
 int vt_parser_write_modified_key(vt_parser_t *vt_parser, int key, int modcode);
 

diff --git a/vtemu/vt_term.c b/vtemu/vt_term.c
@@ -921,6 +921,7 @@ int vt_term_get_config(vt_term_t *term, vt_term_t *output, /* if term == output,
 #if defined(__ANDROID__) && defined(USE_LIBSSH2)
   else if (strcmp(key, "start_with_local_pty") == 0) {
     value = start_with_local_pty ? "true" : "false";
+  }
 #endif
   else {
     /* Continue to process it in x_screen.c */