From 79ed54ff31ed654b953d46987851ce4f572245c2 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 27 Jun 2017 08:20:14 -0400
Subject: Another large batch of re-organization for lumina-desktop-unified.
 This gets the new "NativeWindowSystem" and associated Native* classes all
 integrated (untested)

---
 src-qt5/core/libLumina/NativeWindow.pri | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/libLumina/NativeWindow.pri')

diff --git a/src-qt5/core/libLumina/NativeWindow.pri b/src-qt5/core/libLumina/NativeWindow.pri
index a5715287..b10e472c 100644
--- a/src-qt5/core/libLumina/NativeWindow.pri
+++ b/src-qt5/core/libLumina/NativeWindow.pri
@@ -4,9 +4,11 @@ QT *= x11extras
 LIBS *= -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage 
 
 SOURCES *= $${PWD}/NativeWindow.cpp \
-		$${PWD}/NativeWindowSystem.cpp
+		$${PWD}/NativeWindowSystem.cpp \
+		$${PWD}/NativeEventFilter.cpp
 
 HEADERS *= $${PWD}/NativeWindow.h \
-		$${PWD}/NativeWindowSystem.h
+		$${PWD}/NativeWindowSystem.h \
+		$${PWD}/NativeEventFilter.h
 
 INCLUDEPATH *= $${PWD}
-- 
cgit 


From 0c406639a823f4cad097c8e5a98606658d44bbf4 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Fri, 7 Jul 2017 14:59:20 -0400
Subject: Commit a work-in-progress for converting an X11 keycode into a
 Qt::Key definition

---
 src-qt5/core/libLumina/NativeWindow.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src-qt5/core/libLumina/NativeWindow.pri')

diff --git a/src-qt5/core/libLumina/NativeWindow.pri b/src-qt5/core/libLumina/NativeWindow.pri
index b10e472c..fef9c736 100644
--- a/src-qt5/core/libLumina/NativeWindow.pri
+++ b/src-qt5/core/libLumina/NativeWindow.pri
@@ -1,7 +1,7 @@
 
 # Files
 QT *= x11extras
-LIBS *= -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage 
+LIBS *= -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lxcb-keysyms -lXdamage 
 
 SOURCES *= $${PWD}/NativeWindow.cpp \
 		$${PWD}/NativeWindowSystem.cpp \
-- 
cgit 


From 6f1d3946d52feceaa5d875a079a148c775140d5f Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Sat, 8 Jul 2017 11:46:00 -0400
Subject: Split out the X11->Qt conversion function into it's own file (getting
 too long to be mixed in with the rest of the class). Also finish up a lot
 more of the conversions. Should be ready for testing now.

---
 src-qt5/core/libLumina/NativeWindow.pri | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src-qt5/core/libLumina/NativeWindow.pri')

diff --git a/src-qt5/core/libLumina/NativeWindow.pri b/src-qt5/core/libLumina/NativeWindow.pri
index fef9c736..013291ff 100644
--- a/src-qt5/core/libLumina/NativeWindow.pri
+++ b/src-qt5/core/libLumina/NativeWindow.pri
@@ -5,6 +5,7 @@ LIBS *= -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damag
 
 SOURCES *= $${PWD}/NativeWindow.cpp \
 		$${PWD}/NativeWindowSystem.cpp \
+		$${PWD}/NativeKeyToQt.cpp \
 		$${PWD}/NativeEventFilter.cpp
 
 HEADERS *= $${PWD}/NativeWindow.h \
-- 
cgit 


From 6a2af03c68033a9683de619b4ae6493a4f7254b7 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 13 Jul 2017 14:02:59 -0400
Subject: Large update to the window embedding systems - almost have the
 compositing up and running.

---
 src-qt5/core/libLumina/NativeWindow.pri | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/libLumina/NativeWindow.pri')

diff --git a/src-qt5/core/libLumina/NativeWindow.pri b/src-qt5/core/libLumina/NativeWindow.pri
index 013291ff..c2ac0137 100644
--- a/src-qt5/core/libLumina/NativeWindow.pri
+++ b/src-qt5/core/libLumina/NativeWindow.pri
@@ -6,10 +6,12 @@ LIBS *= -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damag
 SOURCES *= $${PWD}/NativeWindow.cpp \
 		$${PWD}/NativeWindowSystem.cpp \
 		$${PWD}/NativeKeyToQt.cpp \
-		$${PWD}/NativeEventFilter.cpp
+		$${PWD}/NativeEventFilter.cpp \
+		$${PWD}/NativeEmbedWidget.cpp
 
 HEADERS *= $${PWD}/NativeWindow.h \
 		$${PWD}/NativeWindowSystem.h \
-		$${PWD}/NativeEventFilter.h
+		$${PWD}/NativeEventFilter.h \
+		$${PWD}/NativeEmbedWidget.h
 
 INCLUDEPATH *= $${PWD}
-- 
cgit