nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove the kde icon hint, they use the EWMH icon now

Browse source
This commit is contained in:
Dana Jansens 2007-03-11 00:59:13 +00:00
parent 35ab1264ee
commit bd19fd06db
4 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
openbox/client.c
View file

@ -1775,23 +1775,6 @@ void client_update_icons(ObClient *self)
g_assert(i <= num); g_assert(i <= num);
} }
g_free(data);
} else if (PROP_GETA32(self->window, kwm_win_icon,
kwm_win_icon, &data, &num)) {
if (num == 2) {
self->nicons++;
self->icons = g_new(ObClientIcon, self->nicons);
xerror_set_ignore(TRUE);
if (!RrPixmapToRGBA(ob_rr_inst,
data[0], data[1],
&self->icons[self->nicons-1].width,
&self->icons[self->nicons-1].height,
&self->icons[self->nicons-1].data)) {
g_free(&self->icons[self->nicons-1]);
self->nicons--;
}
xerror_set_ignore(FALSE);
}
g_free(data); g_free(data);
} else { } else {
XWMHints *hints; XWMHints *hints;

10
openbox/event.c
View file

@ -1110,11 +1110,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
b == prop_atoms.wm_icon_name)) { b == prop_atoms.wm_icon_name)) {
continue; continue;
} }
if ((a == prop_atoms.net_wm_icon || if (a == prop_atoms.net_wm_icon &&
a == prop_atoms.kwm_win_icon) b == prop_atoms.net_wm_icon)
&&
(b == prop_atoms.net_wm_icon ||
b == prop_atoms.kwm_win_icon))
continue; continue;
XPutBackEvent(ob_display, &ce); XPutBackEvent(ob_display, &ce);
@ -1148,8 +1145,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
else if (msgtype == prop_atoms.net_wm_strut) { else if (msgtype == prop_atoms.net_wm_strut) {
client_update_strut(client); client_update_strut(client);
} }
else if (msgtype == prop_atoms.net_wm_icon || else if (msgtype == prop_atoms.net_wm_icon) {
msgtype == prop_atoms.kwm_win_icon) {
client_update_icons(client); client_update_icons(client);
} }
else if (msgtype == prop_atoms.sm_client_id) { else if (msgtype == prop_atoms.sm_client_id) {

2
openbox/prop.c
View file

@ -146,8 +146,6 @@ void prop_startup()
CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE"); CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE");
CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE"); CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
CREATE(kwm_win_icon, "KWM_WIN_ICON");
CREATE(rootpmapid, "_XROOTPMAP_ID"); CREATE(rootpmapid, "_XROOTPMAP_ID");
CREATE(esetrootid, "ESETROOT_PMAP_ID"); CREATE(esetrootid, "ESETROOT_PMAP_ID");

2
openbox/prop.h
View file

@ -158,8 +158,6 @@ typedef struct Atoms {
Atom kde_wm_change_state; Atom kde_wm_change_state;
Atom kde_net_wm_window_type_override; Atom kde_net_wm_window_type_override;
Atom kwm_win_icon;
Atom rootpmapid; Atom rootpmapid;
Atom esetrootid; Atom esetrootid;