OSC 7750 for dynamic change of emojis style; support style Emojis=zoom

samuelbuenofran · Feb 19, 2021 · 3ee999c · 3ee999c
1 parent 3ad9946
commit 3ee999c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 3 deletions.
diff --git a/docs/mintty.1 b/docs/mintty.1
@@ -1319,6 +1319,8 @@ Supported styles are:
 \(en \fBsamsung\fP Use Samsung emoji graphics.
 .br
 \(en \fBwindows\fP Use Windows emoji graphics.
+.br
+\(en \fBzoom\fP Use Zoom emoji graphics.
 
 Note that all style options only work if the respective emoji graphics repository 
 is deployed in a mintty resource directory, subdirectory \fIemojis\fP.

diff --git a/src/config.c b/src/config.c
@@ -592,6 +592,7 @@ static opt_val
     {"facebook", EMOJIS_FB},
     {"samsung", EMOJIS_SAMSUNG},
     {"windows", EMOJIS_WINDOWS},
+    {"zoom", EMOJIS_ZOOM},
     {0, 0}
   },
   [OPT_EMOJI_PLACEMENT] = (opt_val[]) {
@@ -976,8 +977,9 @@ set_option(string name, string val_str, bool from_file)
     }
   }
   //__ %2$s: option name, %1$s: invalid value
-  opterror(_("Ignoring invalid value '%s' for option '%s'"), 
-           from_file, val_str, name);
+  if (!wnd)  // report errors only during initialisation
+    opterror(_("Ignoring invalid value '%s' for option '%s'"), 
+             from_file, val_str, name);
   return -1;
 }
 

diff --git a/src/config.h b/src/config.h
@@ -17,7 +17,7 @@ enum { FLASH_FRAME = 1, FLASH_BORDER = 2, FLASH_FULL = 4, FLASH_REVERSE = 8 };
 enum { EMOJIS_NONE = 0, EMOJIS_ONE = 1, EMOJIS_NOTO = 2, EMOJIS_APPLE = 3, 
        EMOJIS_GOOGLE = 4, EMOJIS_TWITTER = 5, EMOJIS_FB = 6, 
        EMOJIS_SAMSUNG = 7, EMOJIS_WINDOWS = 8, EMOJIS_JOYPIXELS = 9, 
-       EMOJIS_OPENMOJI = 10 };
+       EMOJIS_OPENMOJI = 10, EMOJIS_ZOOM = 11 };
 enum { EMPL_STRETCH = 0, EMPL_ALIGN = 1, EMPL_MIDDLE = 2, EMPL_FULL = 3 };
 
 // Colour values.

diff --git a/src/term.c b/src/term.c
@@ -1770,6 +1770,11 @@ fallback:;
       sep = "-";
       zwj = false;
       sel = false;
+    when EMOJIS_ZOOM:
+      pre = "zoom/";
+      sep = "-";
+      zwj = false;
+      sel = false;
     when EMOJIS_ONE:
       pre = "emojione/";
     when EMOJIS_APPLE:

diff --git a/src/termout.c b/src/termout.c
@@ -3886,6 +3886,10 @@ do_cmd(void)
           }
         }
       }
+    when 7750:
+      set_arg_option("Emojis", strdup(s));
+      clear_emoji_data();
+      win_invalidate_all(false);
     when 8: {  // hyperlink attribute
       char * link = s;
       char * url = strchr(s, ';');

diff --git a/wiki/Changelog.md b/wiki/Changelog.md
@@ -1,3 +1,7 @@
+Configuration
+  * Support style Emojis=zoom.
+  * OSC 7750 for dynamic change of emojis style.
+
 ### 3.4.5 (17 February 2021) ###
 
 Terminal features

diff --git a/wiki/CtrlSeqs.md b/wiki/CtrlSeqs.md
@@ -396,6 +396,14 @@ As usual, OSC sequences can also be terminated with `^[\` (_ST_, the string term
 When the font size is queried, a sequence that would restore the current font and window size is sent.
 
 
+## Emojis style ##
+
+Like OSC 50 for font style, this sequence can change the emojis style.
+For values, see setting `Emojis` in the manual.
+
+> `^[]7750;_emojis-style_`^G`
+
+
 ## Locale ##
 
 The locale and charset used by the terminal can be queried or changed using

diff --git a/wiki/Tips.md b/wiki/Tips.md
@@ -1018,6 +1018,8 @@ Emoji data can be found at the following sources:
 * [JoyPixels](https://www.joypixels.com/) (formerly EmojiOne)
   * Download JoyPixels Free (or Premium)
   * Deploy the preferred subdirectory (e.g. png/unicode/128) as `joypixels`
+* Zoom (with an installed Zoom meeting client)
+  * Deploy $APPDATA/Zoom/data/Emojis/*.png into `zoom`
 <img align=right src=https://github.com/mintty/mintty/wiki/mintty-emojis.png>
 
 To “Clone” with limited download volume, use the command `git clone --depth 1`.