Port to GTK4

.github/workflows/build.yml

@@ -6,15 +6,15 @@ jobs:
     name: GCC (Linux)
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: |
         sudo apt update
-        sudo apt install -y qstat intltool cmake libgtk2.0-dev libgeoip-dev libminizip-dev libreadline-dev
+        sudo apt install -y qstat gettext cmake libgtk-4-dev libgeoip-dev libminizip-dev libreadline-dev libxml2-dev
     - name: Update submodules
       run: git submodule update --init --recursive
     - name: cmake
-      run: CC=gcc CXX=g++ cmake -DWITH_QSTAT=/usr/bin/quakestat -DCMAKE_C_FLAGS=-Werror .
+      run: CC=gcc CXX=g++ cmake -DWITH_QSTAT=/usr/bin/quakestat .
     - name: make
       run: make -j"$(nproc)"
     - name: make install
@@ -24,15 +24,15 @@ jobs:
     name: Clang (Linux)
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: |
         sudo apt update
-        sudo apt install -y qstat intltool cmake libgtk2.0-dev libgeoip-dev libminizip-dev libreadline-dev
+        sudo apt install -y qstat gettext cmake libgtk-4-dev libgeoip-dev libminizip-dev libreadline-dev libxml2-dev
     - name: Update submodules
       run: git submodule update --init --recursive
     - name: cmake
-      run: CC=clang CXX=clang++ cmake -DWITH_QSTAT=/usr/bin/quakestat -DCMAKE_C_FLAGS=-Werror .
+      run: CC=clang CXX=clang++ cmake -DWITH_QSTAT=/usr/bin/quakestat .
     - name: make
       run: make -j"$(nproc)"
     - name: make install

CMakeLists.txt

@@ -1,23 +1,5 @@
 cmake_minimum_required(VERSION 3.27)
 
-# Required since CMake 3.4 otherwise symbols are not exported and
-# XQF can't find some internal resources like compiled XPM images.
-#
-# See:
-# - https://cmake.org/cmake/help/latest/release/3.4.html
-# - https://cmake.org/cmake/help/v3.4/variable/CMAKE_ENABLE_EXPORTS.html
-# - https://cmake.org/cmake/help/v3.27/variable/CMAKE_ENABLE_EXPORTS.html
-# - https://cmake.org/cmake/help/v3.27/variable/CMAKE_EXECUTABLE_ENABLE_EXPORTS.html
-# - https://cmake.org/cmake/help/v3.27/prop_tgt/ENABLE_EXPORTS.html
-#
-# > Normally an executable does not export any symbols because it is the final program.
-# > It is possible for an executable to export symbols to be used by loadable modules.
-# > When this property is set to true CMake will allow other targets to "link" to the executable.
-#
-# For some reasons we need that for the executable to find embedded
-# data at run time.
-set(CMAKE_EXECUTABLE_ENABLE_EXPORTS ON)
-
 include(CheckCXXCompilerFlag)
 
 # Project information
@@ -49,7 +31,6 @@ set(DOMAIN "${PROJECT_NAME}")
 set(LINGUAS ca da de es fi fr pl ru)
 
 set(DEFAULT_QSTAT "qstat")
-set(DEFAULT_GTK_TARGET 2)
 
 # Macros
 macro(set_c_flag FLAG)
@@ -235,6 +216,9 @@ set(xqf_SOURCES
 	 ${CMAKE_SOURCE_DIR}/src/utils.c
 	 ${CMAKE_SOURCE_DIR}/src/xqf.c
 	 ${CMAKE_SOURCE_DIR}/src/xqf-ui.c
+	 ${CMAKE_SOURCE_DIR}/src/xqf-server-item.c
+	 ${CMAKE_SOURCE_DIR}/src/xqf-player-item.c
+	 ${CMAKE_SOURCE_DIR}/src/xqf-lists.c
 	 ${CMAKE_SOURCE_DIR}/src/zipped.c
 	 ${CMAKE_SOURCE_DIR}/src/redial.c
 	 ${CMAKE_SOURCE_DIR}/src/q3maps.c
@@ -280,6 +264,9 @@ set(xqf_SOURCES
 	 ${CMAKE_SOURCE_DIR}/src/system.h
 	 ${CMAKE_SOURCE_DIR}/src/utils.h
 	 ${CMAKE_SOURCE_DIR}/src/xqf-ui.h
+	 ${CMAKE_SOURCE_DIR}/src/xqf-server-item.h
+	 ${CMAKE_SOURCE_DIR}/src/xqf-player-item.h
+	 ${CMAKE_SOURCE_DIR}/src/xqf-lists.h
 	 ${CMAKE_SOURCE_DIR}/src/xqf.h
 	 ${CMAKE_SOURCE_DIR}/src/zipped.h
 	 ${CMAKE_SOURCE_DIR}/src/redial.h
@@ -555,19 +542,7 @@ set(flag_DATA
 	${CMAKE_SOURCE_DIR}/pixmaps/flags/country/zw.png
 )
 
-set(xpm_MAIN ${CMAKE_SOURCE_DIR}/pixmaps/xqf.xpm)
-
-set(xpm_DATA
-	 ${CMAKE_SOURCE_DIR}/src/xpm/update.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/refresh.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/refrsel.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/stop.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/connect.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/observe.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/record.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/sfilter.xpm
-	 ${CMAKE_SOURCE_DIR}/src/xpm/pfilter.xpm
- )
+file(GLOB png_DEFAULT_DATA ${CMAKE_SOURCE_DIR}/pixmaps/default/*.png)
 
 set(icon_SIZE 22 32 48 128)
 
@@ -586,32 +561,19 @@ if (BUILD_XQF OR BUILD_RCON)
 	add_executable(gamesxml2c ${CMAKE_SOURCE_DIR}/src/gamesxml2c.c)
 	target_link_libraries(gamesxml2c xml2)
 
-	# Custom build rule for converting games.xml to games.c
+	# Custom build rule for converting games.xml to games.c/games.h
 	add_custom_command(
-		OUTPUT ${CMAKE_BINARY_DIR}/games.c
+		OUTPUT ${CMAKE_BINARY_DIR}/games.c ${CMAKE_BINARY_DIR}/games.h
 		COMMAND gamesxml2c ${CMAKE_SOURCE_DIR}/src/games.xml ${CMAKE_BINARY_DIR}/games.c ${CMAKE_BINARY_DIR}/games.h ${CMAKE_BINARY_DIR}/icons.c
 		MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/src/games.xml
 		DEPENDS gamesxml2c)
 
 	# Define games.c filename for including in src/game.c
 	add_definitions(-DGAMES_C_INCLUDE="${CMAKE_BINARY_DIR}/games.c")
 	add_definitions(-DGAMES_H_INCLUDE="${CMAKE_BINARY_DIR}/games.h")
-	add_definitions(-DICONS_C_INCLUDE="${CMAKE_BINARY_DIR}/icons.c")
 endif()
 
 if (BUILD_XQF)
-	set(GTK_TARGET_HELP "GTK target (2 or 3)")
-	set(GTK_TARGET "${DEFAULT_GTK_TARGET}" CACHE STRING "${GTK_TARGET_HELP}")
-
-	# Default GTK_TARGET setting
-	if (NOT (GTK_TARGET STREQUAL "2" OR GTK_TARGET STREQUAL "3"))
-		set(GTK_TARGET "${DEFAULT_GTK_TARGET}" CACHE STRING "${GTK_TARGET_HELP}" FORCE)
-	endif()
-
-	# GUI definitions
-	if (GTK_TARGET STREQUAL "2")
-		set_c_cxx_flag("-Wno-deprecated-declarations")
-	endif()
 
 	# Other definitions
 	if (USE_GEOIP)
@@ -628,7 +590,7 @@ if (BUILD_XQF)
 if(NOT UNZIP_FOUND)
   pkg_check_modules(UNZIP REQUIRED minizip)
 endif()
-	pkg_check_modules(GTK REQUIRED gtk+-${GTK_TARGET}.0)
+	pkg_check_modules(GTK REQUIRED gtk4>=4.0)
 
 	include_directories(${GTK_INCLUDE_DIRS})
 	link_directories(${GTK_LIBRARY_DIRS})
@@ -658,8 +620,12 @@ endif()
 	# Compile and link
 	add_executable(xqf ${xqf_SOURCES})
 	target_compile_definitions(xqf PUBLIC BUILD_XQF)
-	target_compile_definitions(xqf PUBLIC GUI_GTK${GTK_TARGET})
-	target_link_libraries(xqf ${UNZIP_LIBRARIES} ${GTK_LIBRARIES} dl m)
+	target_compile_definitions(xqf PUBLIC GUI_GTK4)
+	# Suppress deprecated-declarations during the GTK4 migration: srv-info.c,
+	# xqf-ui.c and related files intentionally keep GtkTreeView/GtkTreeStore
+	# until those panels are ported to GtkListView/GtkColumnView.
+	target_compile_options(xqf PRIVATE -Wno-deprecated-declarations)
+	target_link_libraries(xqf ${UNZIP_LIBRARIES} ${GTK_LIBRARIES} m)
 
 	if (USE_GEOIP)
 		target_link_libraries(xqf GeoIP)
@@ -708,15 +674,12 @@ endif()
 		DESTINATION "${CMAKE_INSTALL_PREFIX}${XQF_BIN_DIR}")
 
 	# UI
-	install(FILES ${CMAKE_SOURCE_DIR}/src/xqf-gtk${GTK_TARGET}.ui
+	install(FILES ${CMAKE_SOURCE_DIR}/src/xqf.ui
 	DESTINATION ${PACKAGE_DATA_DIR}/ui)
 
 	# Icons
-	install(FILES ${xpm_DATA}
-		DESTINATION ${PACKAGE_DATA_DIR}/xpm)
-
-	install(FILES ${xpm_MAIN}
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+	install(FILES ${png_DEFAULT_DATA}
+		DESTINATION ${PACKAGE_DATA_DIR}/default)
 
 	install(FILES ${flag_DATA}
 		DESTINATION ${PACKAGE_DATA_DIR}/default/flags)