git-svn-id: file:///media/LinuxData/Development/SVN/XDecorations@192 …

…a077cb93-66c8-45fd-b335-998722470d8a

Changlog

@@ -1,4 +1,7 @@
 0.1.7
+This is the last release that will write to the root window as most distros seem to block this one way or another.
+Added y offsets for snow etc settling on windows.
+Added y offsets for snow etc settling on bottom.
 Added packaging script thanks to Mario for that.
 Added different max settling height to windows.
 Changed some option names.

INSTALL

@@ -59,6 +59,8 @@ If no command line otions are used and no config file exists at ~/.config/xdecor
 CAVEATS:
 You MUST have a composite manager running to use the windowing option ( default ), semi transparent images can ONLY be used when in window mode, when writing to the root window ( -no-usewindow ) the alpha blend of the images will be ignored.
 
+Snow etc settling on windows and at the bottom of the screen is only available if you are writing to a window ( -usewindow ) and NOT if you are writing to the root window ( -no-usewindow ), this is the last version - 0.1.7 that will support writing to the root window.
+
 Bugs suggestions etc to:
 
 [email protected]

draw.cpp

@@ -221,6 +221,9 @@ void drawWindowSnow(void)
 
 void drawSettled(void)
 {
+	if(maxBottomHeight==0)
+		return;
+
 	XSetClipMask(display,gc,bottomSnow.mask);
 	XSetClipOrigin(display,gc,0,displayHeight-bottomSnow.maxHeight-bottomYOffset);
 	XCopyArea(display,bottomSnow.pixmap,drawOnThis,gc,0,0,displayWidth,bottomSnow.maxHeight,0,displayHeight-bottomSnow.maxHeight-bottomYOffset);

globals.cpp

@@ -46,6 +46,8 @@ bool			figureNeedsUpdate=false;
 bool			fallingNeedsUpdate=false;
 bool			lampsNeedsUpdate=false;
 
+bool			usingRootWindow=false;
+
 //settled
 settled			windowSnow[MAXWINDOWS];
 settled			bottomSnow;

globals.h

@@ -123,6 +123,8 @@ extern bool				figureNeedsUpdate;
 extern bool				fallingNeedsUpdate;
 extern bool				lampsNeedsUpdate;
 
+extern bool				usingRootWindow;
+
 //settled
 extern settled			windowSnow[MAXWINDOWS];
 extern settled			bottomSnow;

startstop.cpp

@@ -12,6 +12,10 @@
 
 void initBottomSnow(void)
 {
+
+	if(maxBottomHeight==0)
+		return;
+
 	bottomSnow.pixmap=XCreatePixmap(display,drawOnThis,displayWidth,maxBottomHeight+1,depth);
 	bottomSnow.mask=XCreatePixmap(display,drawOnThis,displayWidth,maxBottomHeight+1,1);
 	bottomSnow.maskgc=XCreateGC(display,bottomSnow.mask,0,NULL);
@@ -26,6 +30,9 @@ void initBottomSnow(void)
 
 void initWindowSnow(void)
 {
+	if(maxWindowHeight==0)
+		return;
+
 	for(int j=0;j<MAXWINDOWS;j++)
 		{
 			windowSnow[j].pixmap=0;

update.cpp

@@ -12,6 +12,9 @@
 
 void clearBottomSnow(void)
 {
+	if(maxBottomHeight==0)
+		return;
+
 	for(int j=0; j<displayWidth; j++)
 		bottomSnow.lasty[j]=maxBottomHeight;
 

xdecorations.cpp

@@ -693,6 +693,7 @@ int main(int argc,char* argv[])
 			visual=DefaultVisual(display,screen);
 			useBuffer=false;
 			drawOnThis=rootWin;
+			usingRootWindow=true;
 		}
 	else
 		{
@@ -752,7 +753,8 @@ int main(int argc,char* argv[])
 					printf("Can't get ARGB, do you have a composite manager running\n");
 					drawOnThis=rootWin;
 					useBuffer=false;
-				}
+					usingRootWindow=true;
+			}
 		}
 
 	gc=XCreateGC(display,drawOnThis,0,NULL);
@@ -762,6 +764,12 @@ int main(int argc,char* argv[])
 	blackColor=BlackPixel(display,screen);
 	whiteColor=WhitePixel(display,screen);
 
+	if(usingRootWindow==true)
+		{
+			maxBottomHeight=0;
+			maxWindowHeight=0;
+		}
+
 	initBottomSnow();
 	initWindowSnow();
 	initLamps();
@@ -845,7 +853,8 @@ int main(int argc,char* argv[])
 			if(watchConfig==true)
 				reloadConfig();
 
-			getOpenwindows();
+			if(usingRootWindow==false)
+				getOpenwindows();
 		}
 
 	if(useWindow==false)