major changes to lfstray, changes to lfstoolkit, see changelogs

Author: KeithDHedger

.gitignore

@@ -72,4 +72,6 @@ devtests
 
 LFSTray/lfstray.sample
 LFSTray/LFSTray/app/lfstray
-*config.h.in
+*config.h.in
+
+*/*/src.*

LFSToolKit/ChangeLog

@@ -1,4 +1,5 @@
 0.6.1
+Added LFSTK_moveResizeWindow to lib.
 Fix window tile cario surface getting occasional wrong size.
 Added extra positioning for window context window.
 Updated Window example.

LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.cpp

@@ -263,13 +263,29 @@ void LFSTK_applicationClass::LFSTK_setTimerCallBack(bool (*timer)(LFSTK_applicat
 	this->callBacks.ignoreOrphanModKeys=true;
 }
 
+/**
+* Set event callback for main loop,
+* \param bool functionname (LFSTK_applicationClass *p,void* ud)
+* \param void* ud User data passed to function.
+*/
+void LFSTK_applicationClass::LFSTK_setEventCallBack(bool (*evcb)(LFSTK_applicationClass*,XEvent*),void* ud)
+{
+//	this->callBacks.validCallbacks|=EVENTCB;
+	this->eventCallback=evcb;
+	//this->callBacks.keyUserData=ud;
+	//this->callBacks.runTheCallback=true;
+	//this->callBacks.ignoreOrphanModKeys=true;
+}
+
 /**
 * Run main loop,
 * \note default to this->mainWindow.
 */
 int LFSTK_applicationClass::LFSTK_runApp(void)
 {
 	XEvent	event;
+	bool		retval=false;
+
 	this->mainLoop=true;
 	fd_set readfd;
 	struct timeval tv={0,0};
@@ -301,6 +317,14 @@ int LFSTK_applicationClass::LFSTK_runApp(void)
 					while(XPending(this->display))
 						{
 							XNextEvent(this->display,&event);
+
+							if(this->eventCallback!=NULL)
+								{
+									retval=this->eventCallback(this,&event);
+									if(retval==true)
+										continue;
+								}
+
 							mappedListener *ml=this->mainWindow->LFSTK_getMappedListener(event.xany.window);
 
 							if(ml!=NULL)
@@ -322,6 +346,7 @@ int LFSTK_applicationClass::LFSTK_runApp(void)
 										}
 								}
 						}
+					usleep(1000);
 				}
 			else
 				{

LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.h

@@ -64,6 +64,10 @@ class LFSTK_applicationClass
 		void						LFSTK_setTimer(int delay,bool usemicroseconds=false);
 		void						LFSTK_setTimerCallBack(bool (*timer)(LFSTK_applicationClass*,void*),void* ud);
 
+//events
+		void						LFSTK_setEventCallBack(bool (*evcb)(LFSTK_applicationClass*,XEvent*),void* ud);
+		bool						(*eventCallback)(LFSTK_applicationClass*,XEvent *ev)=NULL;
+
 //gui
 		bool						mainLoop=false;
 		int						exitValue=0;
@@ -92,6 +96,7 @@ class LFSTK_applicationClass
 		std::string				iconThemeName="";
 		std::map<unsigned long,Atom>	appAtomsHashed;
 
+
 	private:
 		int						displayNum;
 		bool						useTimer=false;

LFSToolKit/LFSToolKit/lfstk/LFSTKGlobals.h

@@ -257,7 +257,8 @@ class LFSTK_applicationClass;
 #define	TIMERCB			0x80
 #define	MOUSEENTERCB		0x100
 #define	MOUSEEXITCB		0x200
-#define ALLCB			0x2ff
+#define ALLCB			0x3ff
+#define EVENTCB			0x400
 
 struct propertyStruct
 {
@@ -296,6 +297,7 @@ struct callbackStruct
 	bool					runTheCallback=true;
 	bool					ignoreOrphanModKeys=true;
 	int					validCallbacks=NOCB;
+//	bool					(*evCallback)(LFSTK_applicationClass*,void*)=NULL;
 
 };
 

LFSToolKit/LFSToolKit/lfstk/LFSTKWindow.cpp

@@ -404,6 +404,25 @@ void LFSTK_windowClass::LFSTK_moveWindow(int x,int y,bool tellx)
 	this->LFSTK_clearWindow();
 }
 
+/**
+* Move and resize window.
+* \param x New X.
+* \param y New Y.
+* \param w New W.
+* \param h New H.
+* \param tellx Inform X (default=true).
+*/
+void LFSTK_windowClass::LFSTK_moveResizeWindow(int x,int y,int w,int h,bool tellx)
+{
+	this->setWindowGeom(x,y,w,h,WINDSETALL);
+	if(tellx==true)
+		XMoveResizeWindow(this->app->display,this->window,x,y,w,h);
+
+	this->globalLib->LFSTK_setCairoSurface(this->app->display,this->window,this->visual,&this->sfc,&this->cr,w,h);
+  	this->w=w;
+  	this->h=h;
+	this->LFSTK_clearWindow();
+}
 /**
 * Set default font string.
 * \param s Font string.
@@ -738,7 +757,7 @@ void LFSTK_windowClass::windowClassInitCommon(windowInitStruct *wi)
 			this->window=XCreateWindow(this->app->display,this->app->rootWindow,wi->x,wi->y,wi->w,wi->h,0,CopyFromParent,InputOutput,CopyFromParent,CWWinGravity|CWOverrideRedirect,&wa);
 		}
 
-	XSelectInput(this->app->display,this->window,SubstructureRedirectMask|StructureNotifyMask|ButtonPressMask | ButtonReleaseMask | ExposureMask|LeaveWindowMask|FocusChangeMask|SelectionClear|SelectionRequest);
+	XSelectInput(this->app->display,this->window,SubstructureRedirectMask|StructureNotifyMask|ButtonPressMask | ButtonReleaseMask | ExposureMask|LeaveWindowMask|FocusChangeMask|SelectionClear|SelectionRequest | PropertyChangeMask);
 
 	XSetWMProtocols(this->app->display,this->window,&wm_delete_window,1);
 	xa=XInternAtom(this->app->display,"_NET_WM_ALLOWED_ACTIONS",False);
@@ -829,7 +848,7 @@ LFSTK_windowClass::LFSTK_windowClass(windowInitStruct *wi,LFSTK_applicationClass
 		{
 			this->window=XCreateWindow(this->app->display,this->app->rootWindow,wi->x,wi->y,wi->w,wi->h,0,CopyFromParent,InputOutput,CopyFromParent,CWWinGravity|CWOverrideRedirect,&wa);
 		}
-	XSelectInput(this->app->display,this->window,SubstructureRedirectMask|StructureNotifyMask|ButtonPressMask | ButtonReleaseMask|ButtonMotionMask | ExposureMask | EnterWindowMask|LeaveWindowMask|FocusChangeMask|SelectionClear|SelectionRequest|KeyReleaseMask|KeyPressMask);
+	XSelectInput(this->app->display,this->window,SubstructureRedirectMask|StructureNotifyMask|ButtonPressMask | ButtonReleaseMask|ButtonMotionMask | ExposureMask | EnterWindowMask|LeaveWindowMask|FocusChangeMask|SelectionClear|SelectionRequest|KeyReleaseMask|KeyPressMask|PropertyChangeMask);
 
 	XSetWMProtocols(this->app->display,this->window,&wm_delete_window,1);
 	xa=XInternAtom(this->app->display,"_NET_WM_ALLOWED_ACTIONS",False);
@@ -1677,6 +1696,7 @@ int LFSTK_windowClass::LFSTK_handleWindowEvents(XEvent *event)
 				break;
 
 			case ClientMessage:
+				fprintf(stderr,"ClientMessage SelectionNotify ev=%p\n",event);
 			case SelectionNotify:
 				{
 					if(event->xclient.message_type == XInternAtom(this->app->display, "WM_PROTOCOLS", 1) && (Atom)event->xclient.data.l[0] == XInternAtom(this->app->display, "WM_DELETE_WINDOW", 1))
@@ -1704,6 +1724,9 @@ int LFSTK_windowClass::LFSTK_handleWindowEvents(XEvent *event)
 						}
 				}
 				break;
+			case PropertyNotify:
+				//fprintf(stderr,"PropertyNotify ev=%p\n",event);
+				break;
 		}
 	this->ignoreContext=false;
 	return(retval);

LFSToolKit/LFSToolKit/lfstk/LFSTKWindow.h

@@ -84,6 +84,7 @@ class LFSTK_windowClass
 		void 				LFSTK_clearWindow(bool cleargadgets=false);
 		void					LFSTK_resizeWindow(int w,int h,bool tellx=true);
 		void					LFSTK_moveWindow(int x,int y,bool tellx=true);
+		void					LFSTK_moveResizeWindow(int x,int y,int w,int h,bool tellx=true);
 		const geometryStruct	*LFSTK_getWindowGeom(void);
 		void					setWindowGeom(int x,int y,int h,int w,setWindowGeomFlags flags);
 

LFSTray/ChangeLog

@@ -1,3 +1,19 @@
+1.0.4
+Reduced flickering when adding/removing icons.
+
+1.0.1
+Added aboveall/belowall.
+Auto set layout to vertical/horizontal for N,S,W,E.
+Added reposition window to N,S,E,W.
+Added choose montior to display on.
+Added vertical layout.
+Added reposition window to NW,NE,SW,SE.
+Reduced flikering when adding icon.
+Set BG to root pixmap.
+Integrate with liblfstoolkit.
+Complete rewrite from scratch to c++.
+Dumped all Stalonetray code ( temp step back ).
+
 1.0.0
 Added to LFSDesktopProject
 

LFSTray/LFSTray/flagsandlibs

@@ -4,6 +4,7 @@ AM_CPPFLAGS =	-I$(top_srcdir) \
 				$(XFT_CFLAGS) \
 				$(CAIRO_CFLAGS) \
 				$(LIBGLIB_CFLAGS)
+				$(IMLIB_CFLAGS) \
 				$(LFSTK_CFLAGS)
 				-DPREFIX=\""${prefix}\"" \
 				-DDATADIR=\""${pkgdatadir}"\" \
@@ -15,5 +16,6 @@ LIBS =			$(X11_LIBS) \
 				$(XFT_LIBS) \
 				$(LIBGLIB_LIBS) \
 				$(LFSTK_LIBS) \
+				$(IMLIB_LIBS) \
 				-lm \
 				-lstdc++fs

LFSTray/LFSTray/sources

@@ -1 +1 @@
-COMMONSRC = ../src/embed.cpp ../src/globals.cpp ../src/icons.cpp ../src/image.cpp ../src/layout.cpp ../src/main.cpp ../src/settings.cpp ../src/tray.cpp ../src/wmh.cpp ../src/xembed.cpp ../src/xutils.cpp
+COMMONSRC = ../src/callbacks.cpp ../src/embedClass.cpp ../src/globals.cpp ../src/main.cpp ../src/trayClass.cpp