Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix x11 taskbar icon/title #8132

Closed
wants to merge 1 commit into from
Closed

Fix x11 taskbar icon/title #8132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/video/x11/SDL_x11window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,6 +1934,18 @@ int SDL_X11_SetWindowTitle(Display *display, Window xwindow, char *title)

if (conv == 0) {
X11_XSetTextProperty(display, xwindow, &titleprop, XA_WM_NAME);

/* update the x11 class name property for the window */
XClassHint *classhints = X11_XAllocClassHint();
if (classhints)
{
classhints->res_class = (char*)titleprop.value;
classhints->res_name = (char*)titleprop.value;

X11_XSetWMProperties(display, xwindow, NULL, NULL, NULL, 0, NULL, NULL, classhints);
X11_XFree(classhints);
}

X11_XFree(titleprop.value);
/* we know this can't be a locale error as we checked X locale validity */
} else if (conv < 0) {
Expand All @@ -1947,6 +1959,18 @@ int SDL_X11_SetWindowTitle(Display *display, Window xwindow, char *title)
status = X11_Xutf8TextListToTextProperty(display, &title, 1, XUTF8StringStyle, &titleprop);
if (status == Success) {
X11_XSetTextProperty(display, xwindow, &titleprop, _NET_WM_NAME);

/* update the x11 class name property for the window */
XClassHint *classhints = X11_XAllocClassHint();
if (classhints)
{
classhints->res_class = (char*)titleprop.value;
classhints->res_name = (char*)titleprop.value;

X11_XSetWMProperties(display, xwindow, NULL, NULL, NULL, 0, NULL, NULL, classhints);
X11_XFree(classhints);
}

X11_XFree(titleprop.value);
} else {
return SDL_SetError("Failed to convert title to UTF8! Bad encoding, or bad Xorg encoding? Window title: «%s»", title);
Expand Down