frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Also update icon when _NET_WM_ICON property changes 

_NET_WM_ICON property is also considered to decide on the window icon, so also
send a WM_WM_ICON_EVENT message to the WM if the PropertyNotify event is for
_NET_WM_ICON property

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-07-22 17:38:55 +01:00
parent a07541f1ff
commit 2677d89823
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/xwin/winmultiwindowwm.c
View File

@ -821,6 +821,7 @@ winMultiWindowXMsgProc(void *pArg)
Atom atmWmName; Atom atmWmName;
Atom atmWmHints; Atom atmWmHints;
Atom atmWmChange; Atom atmWmChange;
Atom atmNetWmIcon;
int iReturn; int iReturn;
XIconSize *xis; XIconSize *xis;
@ -946,6 +947,7 @@ winMultiWindowXMsgProc(void *pArg)
atmWmName = XInternAtom(pProcArg->pDisplay, "WM_NAME", False); atmWmName = XInternAtom(pProcArg->pDisplay, "WM_NAME", False);
atmWmHints = XInternAtom(pProcArg->pDisplay, "WM_HINTS", False); atmWmHints = XInternAtom(pProcArg->pDisplay, "WM_HINTS", False);
atmWmChange = XInternAtom(pProcArg->pDisplay, "WM_CHANGE_STATE", False); atmWmChange = XInternAtom(pProcArg->pDisplay, "WM_CHANGE_STATE", False);
atmNetWmIcon = XInternAtom(pProcArg->pDisplay, "_NET_WM_ICON", False);
/* /*
iiimxcf had a bug until 2009-04-27, assuming that the iiimxcf had a bug until 2009-04-27, assuming that the
@ -1073,25 +1075,25 @@ winMultiWindowXMsgProc(void *pArg)
True, StructureNotifyMask, &event_send); True, StructureNotifyMask, &event_send);
} }
} }
else if (event.type == PropertyNotify else if (event.type == PropertyNotify) {
&& event.xproperty.atom == atmWmName) { if (event.xproperty.atom == atmWmName) {
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.msg = WM_WM_NAME_EVENT; msg.msg = WM_WM_NAME_EVENT;
msg.iWindow = event.xproperty.window; msg.iWindow = event.xproperty.window;
/* Other fields ignored */ /* Other fields ignored */
winSendMessageToWM(pProcArg->pWMInfo, &msg); winSendMessageToWM(pProcArg->pWMInfo, &msg);
} }
else if (event.type == PropertyNotify else if ((event.xproperty.atom == atmWmHints) ||
&& event.xproperty.atom == atmWmHints) { (event.xproperty.atom == atmNetWmIcon)) {
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.msg = WM_WM_ICON_EVENT;
msg.iWindow = event.xproperty.window;
msg.msg = WM_WM_ICON_EVENT; /* Other fields ignored */
msg.iWindow = event.xproperty.window; winSendMessageToWM(pProcArg->pWMInfo, &msg);
}
/* Other fields ignored */
winSendMessageToWM(pProcArg->pWMInfo, &msg);
} }
else if (event.type == ClientMessage else if (event.type == ClientMessage
&& event.xclient.message_type == atmWmChange && event.xclient.message_type == atmWmChange