[rkward-cvs] SF.net SVN: rkward: [2070] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2070
          http://rkward.svn.sourceforge.net/rkward/?rev=2070&view=rev
Author:   tfry
Date:     2007-10-15 12:52:18 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
It compiles!!! (but does not yet link)

Modified Paths:
--------------
    branches/KDE4_port/CMakeLists.txt
    branches/KDE4_port/rkward/CMakeLists.txt
    branches/KDE4_port/rkward/rkwardapplication.cpp

Modified: branches/KDE4_port/CMakeLists.txt
===================================================================
--- branches/KDE4_port/CMakeLists.txt	2007-10-15 19:37:09 UTC (rev 2069)
+++ branches/KDE4_port/CMakeLists.txt	2007-10-15 19:52:18 UTC (rev 2070)
@@ -3,7 +3,7 @@
 
 FIND_PACKAGE(KDE4 REQUIRED)
 
-SET(CMAKE_VERBOSE_MAKEFILE OFF)
+SET(CMAKE_VERBOSE_MAKEFILE ON)
 
 ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-10-15 19:37:09 UTC (rev 2069)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-10-15 19:52:18 UTC (rev 2070)
@@ -36,7 +36,7 @@
 
 KDE4_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
 
-TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc khtml kmdi ${KDE4_KDEUI_LIBS} katepartinterfaces )
+TARGET_LINK_LIBRARIES(rkward.bin ${KDE4_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} katepartinterfaces )
 
 # wrapper script
 GET_DIRECTORY_PROPERTY(R_HOME DIRECTORY rbackend DEFINITION R_HOME)

Modified: branches/KDE4_port/rkward/rkwardapplication.cpp
===================================================================
--- branches/KDE4_port/rkward/rkwardapplication.cpp	2007-10-15 19:37:09 UTC (rev 2069)
+++ branches/KDE4_port/rkward/rkwardapplication.cpp	2007-10-15 19:52:18 UTC (rev 2070)
@@ -20,7 +20,9 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
-#include <kwindowsystem.h>
+#include <QX11Info>
+
+#include <kwindowinfo.h>
 #include <netwm_def.h>
 
 #include "debug.h"
@@ -36,7 +38,7 @@
 	rkapp = this;
 	detect_x11_creations = false;
 
-	wm_name_property = XInternAtom (qt_xdisplay (), "WM_NAME", true);
+	wm_name_property = XInternAtom (QX11Info::display (), "WM_NAME", true);
 }
 
 RKWardApplication::~RKWardApplication () {
@@ -56,7 +58,7 @@
 	created_window = 0;
 	detect_x11_creations = true;
 
-	XSelectInput (qt_xdisplay (), qt_xrootwin (), SubstructureNotifyMask);
+	XSelectInput (QX11Info::display (), QX11Info::appRootWindow (), SubstructureNotifyMask);
 	syncX ();	// this is to make sure we don't miss out on the window creation (if it happens very early). Testing shows, we really need this.
 }
 
@@ -71,7 +73,7 @@
 	}
 
 	detect_x11_creations = false;
-	XSelectInput (qt_xdisplay (), qt_xrootwin (), NoEventMask);
+	XSelectInput (QX11Info::display (), QX11Info::appRootWindow (), NoEventMask);
 	return created_window;
 }
 
@@ -79,7 +81,7 @@
 	RK_TRACE (APP);
 	RK_ASSERT (!name_watchers_list.contains (watched));
 
-	XSelectInput (qt_xdisplay (), watched, PropertyChangeMask);
+	XSelectInput (QX11Info::display (), watched, PropertyChangeMask);
 	name_watchers_list.insert (watched, watcher);
 }
 
@@ -87,15 +89,15 @@
 	RK_TRACE (APP);
 	RK_ASSERT (name_watchers_list.contains (watched));
 
-	XSelectInput (qt_xdisplay (), watched, NoEventMask);
+	XSelectInput (QX11Info::display (), watched, NoEventMask);
 	name_watchers_list.remove (watched);
 }
 
 bool RKWardApplication::x11EventFilter (XEvent *e) {
 	if (detect_x11_creations) {
 		if (e->type == CreateNotify) {
-			if (e->xcreatewindow.parent == qt_xrootwin ()) {
-				KWindowSystem::WindowInfo info = KWindowSystem::windowInfo (e->xcreatewindow.window);
+			if (e->xcreatewindow.parent == QX11Info::appRootWindow ()) {
+				KWindowInfo info = KWindowInfo (e->xcreatewindow.window, NET::WMName, NET::WM2WindowClass);
 				if ((info.windowType (0xFFFF) != 0) && (!info.name ().isEmpty ())) {
 					RK_ASSERT (!created_window);
 					created_window = e->xcreatewindow.window;
@@ -110,7 +112,7 @@
 	if (e->type == PropertyNotify) {
 		if (e->xproperty.atom == wm_name_property) {
 			if (name_watchers_list.contains (e->xproperty.window)) {
-				KWindowSystem::WindowInfo wininfo = KWindowSystem::windowInfo (e->xproperty.window);
+				KWindowInfo wininfo = KWindowInfo (e->xproperty.window, NET::WMName);
 				name_watchers_list[e->xproperty.window]->setCaption (wininfo.name ());
 				return true;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.