all: refactor windows code out of core

There are still some links from core to window but its now separate
enough to fix PanelWindow in qml tooling.

Author: outfoxxed

CMakeLists.txt

@@ -64,15 +64,6 @@ boption(SERVICE_GREETD "Greetd" ON)
 boption(SERVICE_UPOWER "UPower" ON)
 boption(SERVICE_NOTIFICATIONS "Notifications" ON)
 
-if (NOT DEFINED GIT_REVISION)
-	execute_process(
-		COMMAND git rev-parse HEAD
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		OUTPUT_VARIABLE GIT_REVISION
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-	)
-endif()
-
 add_compile_options(-Wall -Wextra)
 
 if (FRAME_POINTERS)

src/CMakeLists.txt

@@ -1,8 +1,13 @@
 qt_add_executable(quickshell main.cpp)
 
+target_link_libraries(quickshell PRIVATE ${QT_DEPS} quickshell-build)
+
 install(TARGETS quickshell RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+add_subdirectory(build)
 add_subdirectory(core)
+add_subdirectory(ipc)
+add_subdirectory(window)
 add_subdirectory(io)
 add_subdirectory(widgets)
 

src/build/CMakeLists.txt

@@ -0,0 +1,26 @@
+add_library(quickshell-build INTERFACE)
+
+if (NOT DEFINED GIT_REVISION)
+	execute_process(
+		COMMAND git rev-parse HEAD
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		OUTPUT_VARIABLE GIT_REVISION
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+endif()
+
+if (CRASH_REPORTER)
+	set(CRASH_REPORTER_DEF 1)
+else()
+	set(CRASH_REPORTER_DEF 0)
+endif()
+
+if (DISTRIBUTOR_DEBUGINFO_AVAILABLE)
+	set(DEBUGINFO_AVAILABLE 1)
+else()
+	set(DEBUGINFO_AVAILABLE 0)
+endif()
+
+configure_file(build.hpp.in build.hpp @ONLY ESCAPE_QUOTES)
+
+target_include_directories(quickshell-build INTERFACE ${CMAKE_CURRENT_BINARY_DIR})

src/core/build.hpp.in renamed to src/build/build.hpp.in

@@ -1,22 +1,16 @@
 find_package(CLI11 CONFIG REQUIRED)
 
 qt_add_library(quickshell-core STATIC
-	main.cpp
 	plugin.cpp
 	shell.cpp
 	variants.cpp
 	rootwrapper.cpp
-	proxywindow.cpp
 	reload.cpp
 	rootwrapper.cpp
 	qmlglobal.cpp
 	qmlscreen.cpp
 	region.cpp
 	persistentprops.cpp
-	windowinterface.cpp
-	floatingwindow.cpp
-	panelinterface.cpp
-	popupwindow.cpp
 	singleton.cpp
 	generation.cpp
 	scan.cpp
@@ -43,32 +37,20 @@ qt_add_library(quickshell-core STATIC
 	paths.cpp
 	instanceinfo.cpp
 	common.cpp
-	ipc.cpp
 )
 
-if (CRASH_REPORTER)
-	set(CRASH_REPORTER_DEF 1)
-else()
-	set(CRASH_REPORTER_DEF 0)
-endif()
-
-if (DISTRIBUTOR_DEBUGINFO_AVAILABLE)
-	set(DEBUGINFO_AVAILABLE 1)
-else()
-	set(DEBUGINFO_AVAILABLE 0)
-endif()
-
-add_library(quickshell-build INTERFACE)
-
-configure_file(build.hpp.in build.hpp @ONLY ESCAPE_QUOTES)
-
-target_include_directories(quickshell-build INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(quickshell-core PRIVATE quickshell-build)
 
-qt_add_qml_module(quickshell-core URI Quickshell VERSION 0.1)
+qt_add_qml_module(quickshell-core
+	URI Quickshell
+	VERSION 0.1
+	IMPORTS Quickshell._Window
+)
+
+target_link_libraries(quickshell-core PRIVATE ${QT_DEPS} CLI11::CLI11)
 
-target_link_libraries(quickshell-core PRIVATE ${QT_DEPS} Qt6::QuickPrivate CLI11::CLI11)
 qs_pch(quickshell-core)
+qs_pch(quickshell-coreplugin)
 
 target_link_libraries(quickshell PRIVATE quickshell-coreplugin)