Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*fix* issue 313 (pcmanfm sets _XROOTMAP_ID instead of _XROOTPMAP_ID)

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@614 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-12-11 09:15:14 +00:00
parent 0ef56da453
commit 07f48183d7
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.c
View File

@@ -36,6 +36,7 @@ void server_catch_error (Display *d, XErrorEvent *ev){}
void server_init_atoms () void server_init_atoms ()
{ {
server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False); server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
server.atom._XROOTMAP_ID = XInternAtom (server.dsp, "_XROOTMAP_ID", False);
server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False); server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False);
server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False); server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False);
server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False); server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False);
@@ -188,16 +189,17 @@ void get_root_pixmap()
Pixmap ret = None; Pixmap ret = None;
unsigned long *res; unsigned long *res;
int c = 2; Atom pixmap_atoms[] = { server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID };
int i;
do { for (i=0; i<sizeof(pixmap_atoms)/sizeof(Atom); ++i) {
res = server_get_property (server.root_win, server.atom._XROOTPMAP_ID, XA_PIXMAP, 0); res = server_get_property (server.root_win, pixmap_atoms[i], XA_PIXMAP, 0);
if (res) { if (res) {
ret = *((Pixmap*)res); ret = *((Pixmap*)res);
XFree(res); XFree(res);
break; break;
} }
} while (--c > 0); }
server.root_pmap = ret; server.root_pmap = ret;
if (server.root_pmap == None) if (server.root_pmap == None)

1
src/server.h
View File

@@ -17,6 +17,7 @@
typedef struct Global_atom typedef struct Global_atom
{ {
Atom _XROOTPMAP_ID; Atom _XROOTPMAP_ID;
Atom _XROOTMAP_ID;
Atom _NET_CURRENT_DESKTOP; Atom _NET_CURRENT_DESKTOP;
Atom _NET_NUMBER_OF_DESKTOPS; Atom _NET_NUMBER_OF_DESKTOPS;
Atom _NET_DESKTOP_NAMES; Atom _NET_DESKTOP_NAMES;

2
src/tint.c
View File

@@ -584,7 +584,7 @@ void event_property_notify (XEvent *e)
active_task(); active_task();
panel_refresh = 1; panel_refresh = 1;
} }
else if (at == server.atom._XROOTPMAP_ID) { else if (at == server.atom._XROOTPMAP_ID || at == server.atom._XROOTMAP_ID) {
// change Wallpaper // change Wallpaper
for (i=0 ; i < nb_panel ; i++) { for (i=0 ; i < nb_panel ; i++) {
set_panel_background(&panel1[i]); set_panel_background(&panel1[i]);