blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #953 from emersion/xwayland-utf8-title 

Use UTF-8 xwayland window title if available
This commit is contained in:
Drew DeVault 2018-05-04 15:49:54 -04:00 committed by GitHub
parent caf9f9022c cf10cbc00c
commit a5e70a2ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/xwayland.h
View File

@ -103,6 +103,7 @@ struct wlr_xwayland_surface {
char *class;
char *instance;
pid_t pid;
bool has_utf8_title;
struct wl_list children; // wlr_xwayland_surface::parent_link
struct wlr_xwayland_surface *parent;

7
xwayland/xwm.c
View File

@ -353,8 +353,10 @@ static void read_surface_title(struct wlr_xwm *xwm,
return;
}
// TODO: if reply->type == XCB_ATOM_STRING, uses latin1 encoding
// if reply->type == xwm->atoms[UTF8_STRING], uses utf8 encoding
bool is_utf8 = reply->type == xwm->atoms[UTF8_STRING];
if (!is_utf8 && xsurface->has_utf8_title) {
return;
}
size_t len = xcb_get_property_value_length(reply);
char *title = xcb_get_property_value(reply);
@ -365,6 +367,7 @@ static void read_surface_title(struct wlr_xwm *xwm,
} else {
xsurface->title = NULL;
}
xsurface->has_utf8_title = is_utf8;
wlr_log(L_DEBUG, "XCB_ATOM_WM_NAME: %s", xsurface->title);
wlr_signal_emit_safe(&xsurface->events.set_title, xsurface);