Skip to content

Commit

Permalink
* gtk/vte_win32.c: "mlterm" -> L"mlterm" if UTF16_IME_CHAR is defined.
Browse files Browse the repository at this point in the history
  • Loading branch information
arakiken committed Jan 5, 2025
1 parent eb6dc55 commit 2e2cf7e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
2025-01-05 Araki Ken <arakiken@users.sf.net>

* gtk/vte_win32.c: "mlterm" -> L"mlterm" if UTF16_IME_CHAR is defined.

* vt_parser.c: Fix https://github.com/arakiken/mlterm/issues/127

* ui_emoji.c: Fix segfault in win32.
Expand Down
5 changes: 5 additions & 0 deletions doc/en/ReleaseNote
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* Support P2=1 in sixel graphics. (https://github.com/arakiken/mlterm/issues/81)
* Support libpng to build mlimgloader if gdk-pixbuf is not found.
(https://github.com/arakiken/mlterm/issues/96)
* Support Emoji variation selectors 15 and 16. (https://github.com/arakiken/mlterm/issues/84)
* Add --conpty/use_conpty and --winsize/output_xtwinops_in_resizing options in win32.
* Add --norepkey/mod_keys_to_stop_mouse_report option.
* Add tool/accessories/applycfg.sh and applyfontcfg.sh
Expand All @@ -37,6 +38,10 @@
https://github.com/arakiken/mlterm/issues/97
https://github.com/arakiken/mlterm/issues/103
https://github.com/arakiken/mlterm/issues/107
https://github.com/arakiken/mlterm/issues/111
https://github.com/arakiken/mlterm/issues/113
https://github.com/arakiken/mlterm/issues/125
https://github.com/arakiken/mlterm/issues/126
Fix an issue where mlconfig was not displayed.
Fix an issue where Control+Shift+xxx shortcut didn't work in SDL2.
Fix unexpected reset of inverted colors in selected area in SDL2.
Expand Down
5 changes: 5 additions & 0 deletions gtk/vte_win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,13 @@ static void show_root(ui_display_t *disp, GtkWidget *widget) {
}
#endif

#ifdef UTF16_IME_CHAR
ui_display_show_root(disp, &PVT(terminal)->screen->window, 0, 0, 0, L"mlterm", NULL,
GDK_WINDOW_HWND(gtk_widget_get_window(widget)));
#else
ui_display_show_root(disp, &PVT(terminal)->screen->window, 0, 0, 0, "mlterm", NULL,
GDK_WINDOW_HWND(gtk_widget_get_window(widget)));
#endif
}

static void trigger_pty_read(void) {
Expand Down

0 comments on commit 2e2cf7e

Please sign in to comment.