nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Completely ignore legacy hints as soon as the client uses _NET_WM_NAME

This commit is contained in:
Michael Stapelberg 2009-03-12 16:44:44 +01:00
parent 0ef49807ba
commit 755709c86d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/data.h
View File

@ -228,6 +228,9 @@ struct Client {
to X as 8-bit string and therefore will not be rendered correctly. This behaviour is to X as 8-bit string and therefore will not be rendered correctly. This behaviour is
to support legacy applications which do not set _NET_WM_NAME */ to support legacy applications which do not set _NET_WM_NAME */
int name_len; int name_len;
/* This will be set to true as soon as the first _NET_WM_NAME comes in. If set to true,
legacy window names are ignored. */
bool uses_net_wm_name;
/* fullscreen is pretty obvious */ /* fullscreen is pretty obvious */
bool fullscreen; bool fullscreen;

8
src/handlers.c
View File

@ -616,6 +616,7 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
char *old_name = client->name; char *old_name = client->name;
client->name = ucs2_name; client->name = ucs2_name;
client->name_len = new_len; client->name_len = new_len;
client->uses_net_wm_name = true;
if (old_name != NULL) if (old_name != NULL)
free(old_name); free(old_name);
@ -646,7 +647,7 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state, int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state,
xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) { xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
LOG("window's name changed (legacy).\n"); LOG("window's name changed (legacy).\n");
if (prop == NULL) { if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
LOG("prop == NULL\n"); LOG("prop == NULL\n");
return 1; return 1;
} }
@ -654,6 +655,11 @@ int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t
if (client == NULL) if (client == NULL)
return 1; return 1;
if (client->uses_net_wm_name) {
LOG("This client is capable of _NET_WM_NAME, ignoring legacy name\n");
return 1;
}
/* Save the old pointer to make the update atomic */ /* Save the old pointer to make the update atomic */
char *new_name; char *new_name;
int new_len; int new_len;