diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-08-05 10:41:24 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-08-05 10:41:24 -0400 |
| commit | f8d8787a2fac3cf2e8b9ded09a1d8c8744eab173 (patch) | |
| tree | 95a63ee97df137ee58943d2971c07992fe48df21 /lumina-desktop | |
| parent | Add a replacement for XSelectInput and use it within lumina-desktop (diff) | |
| download | lumina-f8d8787a2fac3cf2e8b9ded09a1d8c8744eab173.tar.gz lumina-f8d8787a2fac3cf2e8b9ded09a1d8c8744eab173.tar.bz2 lumina-f8d8787a2fac3cf2e8b9ded09a1d8c8744eab173.zip | |
Completely finish the XLib -> XCB conversions. Now Lumina no longer requires any XLib functions/libraries/extensions.
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LSession.cpp | 7 | ||||
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 26cb1699..af59b769 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -19,11 +19,11 @@ #include <unistd.h> //for usleep() usage //X includes (these need to be last due to Qt compile issues) -#include <X11/Xlib.h> +/*#include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> #include <X11/extensions/Xrender.h> -#include <X11/extensions/Xdamage.h> +#include <X11/extensions/Xdamage.h>*/ #ifndef DEBUG #define DEBUG 0 @@ -777,7 +777,8 @@ void LSession::startSystemTray(){ TrayStopping = false; if(SystemTrayID!=0){ XCB->SelectInput(SystemTrayID); //make sure TrayID events get forwarded here - XDamageQueryExtension( QX11Info::display(), &TrayDmgEvent, &TrayDmgError); + TrayDmgEvent = XCB->GenerateDamageID(SystemTrayID); + //XDamageQueryExtension( QX11Info::display(), &TrayDmgEvent, &TrayDmgError); evFilter->setTrayDamageFlag(TrayDmgEvent); qDebug() << "System Tray Started Successfully"; if(DEBUG){ qDebug() << " - System Tray Flags:" << TrayDmgEvent << TrayDmgError; } diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 5996cfab..533c1631 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -12,7 +12,7 @@ isEmpty(LIBPREFIX) { LIBPREFIX = $$PREFIX/lib } -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lXdamage -lX11 -lxcb -lxcb-damage +LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lxcb -lxcb-damage QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina |