fixed include directives

LFSTray/LFSTray/flagsandlibs

@@ -1,12 +1,19 @@
 
 AM_CPPFLAGS =	-I$(top_srcdir) \
 				$(X11_CFLAGS) \
+				$(XFT_CFLAGS) \
+				$(CAIRO_CFLAGS) \
+				$(LIBGLIB_CFLAGS)
+				$(LFSTK_CFLAGS)
 				-DPREFIX=\""${prefix}\"" \
 				-DDATADIR=\""${pkgdatadir}"\" \
 				-DSYSCONFDIR=\""${sysconfdir}/${PACKAGE}"\" \
 				-DLIBDIR=\""${libdir}/${PACKAGE}"\"
 
 LIBS =			$(X11_LIBS) \
 				$(XPM_LIBS) \
+				$(XFT_LIBS) \
+				$(LIBGLIB_LIBS) \
+				$(LFSTK_LIBS) \
 				-lm \
 				-lstdc++fs

LFSTray/LFSTray/src/embed.cpp

@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #include "embed.h"
-#include "common.h"
+#include "globals.h"
 #include "icons.h"
 #include "settings.h"
 #include "tray.h"

LFSTray/LFSTray/src/icons.cpp

@@ -35,7 +35,7 @@
 #include <assert.h>
 
 #include "icons.h"
-#include "common.h"
+#include "globals.h"
 #include "layout.h"
 #include "list.h"
 #include "tray.h"

LFSTray/LFSTray/src/image.cpp

@@ -29,7 +29,7 @@
  * interface
  * -------------------------------*/
 
-#include "common.h"
+#include "globals.h"
 #include "image.h"
 
 /***** Forward declarations  *****/

LFSTray/LFSTray/src/layout.cpp

@@ -35,7 +35,7 @@
 #include <X11/Xutil.h>
 
 #include "config.h"
-#include "common.h"
+#include "globals.h"
 #include "icons.h"
 #include "layout.h"
 #include "list.h"

LFSTray/LFSTray/src/main.cpp

@@ -44,7 +44,7 @@
 
 #include "config.h"
 
-#include "common.h"
+#include "globals.h"
 #include "embed.h"
 #include "icons.h"
 #include "layout.h"

LFSTray/LFSTray/src/settings.cpp

@@ -45,7 +45,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "common.h"
+#include "globals.h"
 #include "layout.h"
 #include "list.h"
 #include "settings.h"

LFSTray/LFSTray/src/tray.cpp

@@ -41,7 +41,7 @@
 
 #include <unistd.h>
 
-#include "common.h"
+#include "globals.h"
 #include "embed.h"
 #include "icons.h"
 #include "image.h"

LFSTray/LFSTray/src/tray.h

@@ -37,7 +37,7 @@
 
 #include <limits.h>
 
-#include "common.h"
+#include "globals.h"
 #include "config.h"
 #include "icons.h"
 

LFSTray/LFSTray/src/wmh.cpp

@@ -30,7 +30,7 @@
 #include <X11/Xatom.h>
 #include <X11/Xmd.h>
 
-#include "common.h"
+#include "globals.h"
 #include "wmh.h"
 #include "xutils.h"
 

LFSTray/LFSTray/src/xembed.cpp

@@ -37,7 +37,7 @@
 #include <X11/Xmd.h>
 #include <X11/Xutil.h>
 
-#include "common.h"
+#include "globals.h"
 #include "wmh.h"
 #include "xembed.h"
 #include "xutils.h"

LFSTray/LFSTray/src/xutils.cpp

@@ -40,7 +40,7 @@
 #include <string.h>
 
 #include "xutils.h"
-#include "common.h"
+#include "globals.h"
 #include "xembed.h"
 
 static int trapped_x11_error_code=0;

LFSTray/LFSTray/src/xutils.h

@@ -34,7 +34,7 @@
 #include <X11/X.h>
 #include <X11/Xatom.h>
 
-#include "common.h"
+#include "globals.h"
 #include "icons.h"
 
 /* Returns 1 if connection is active,0 otherwise */

LFSTray/README.md

@@ -11,6 +11,8 @@ https://github.com/kolbusa/stalonetray
 make
 make install
 ```
+
+You dont need to install to try it out just run lfstray from the app folder.
 ###
 **QUICK USE:**  
 lfstray -h

LFSTray/TODO

@@ -1,7 +1,8 @@
 LOADS!
 
 rearange files - DONE
-convert to c++
+convert to c++ - STARTED ...
+
 integerate into lfstoolkit lib
 redo settings
 add prefs app

LFSTray/configure.ac

@@ -30,8 +30,28 @@ PKG_CHECK_MODULES(XPM, $XPM_MODULES,AC_DEFINE(XPM_SUPPORTED,1,[enable XPM backgr
 AC_SUBST(XPM_CFLAGS)
 AC_SUBST(XPM_LIBS)
 
+XFT_MODULES="xft >= 2.3.1"
+PKG_CHECK_MODULES(XFT, $XFT_MODULES)
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
+
 dnl ============= X11 ================
 
+CAIRO_MODULES="cairo >= 1.12.16"
+PKG_CHECK_MODULES(CAIRO, $CAIRO_MODULES)
+AC_SUBST(CAIRO_LIBS)
+AC_SUBST(CAIRO_CFLAGS)
+
+LIBGLIB_MODULES="glib-2.0 >= 2.60.0"
+PKG_CHECK_MODULES(LIBGLIB, $LIBGLIB_MODULES)
+AC_SUBST(LIBGLIB_LIBS)
+AC_SUBST(LIBGLIB_CFLAGS)
+
+LFSTK_MODULES="lfstk >= 0.6.1"
+PKG_CHECK_MODULES(LFSTK, $LFSTK_MODULES)
+AC_SUBST(LFSTK_LIBS)
+AC_SUBST(LFSTK_CFLAGS)
+
 AC_CONFIG_FILES([Makefile LFSTray/app/Makefile])
 AC_OUTPUT