Make hybrid Wayland/X11 platform.

1 files changed, 56 insertions, 22 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63b5b8399..a9bc91710 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -191,7 +191,7 @@ endif (FLTK_USE_X11 AND NOT OPTION_PRINT_SUPPORT)
 
 set (DRIVER_FILES)
 
-if (FLTK_USE_X11)
+if (FLTK_USE_X11 AND NOT OPTION_USE_WAYLAND)
 
   # X11 (including APPLE with X11)
 
@@ -202,13 +202,6 @@ if (FLTK_USE_X11)
     drivers/Posix/Fl_Posix_System_Driver.cxx
     drivers/Unix/Fl_Unix_System_Driver.cxx
     drivers/X11/Fl_X11_System_Driver.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
-    drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx
     drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
     drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
     drivers/X11/fl_X11_platform_init.cxx
@@ -223,29 +216,56 @@ if (FLTK_USE_X11)
     set (DRIVER_FILES ${DRIVER_FILES} Fl_Native_File_Chooser_Kdialog.cxx)
   endif (OPTION_USE_KDIALOG)
 
-  if (USE_XFT)
+  if (FLTK_USE_CAIRO)
     set (DRIVER_FILES ${DRIVER_FILES}
-      drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+      drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+      drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.cxx
     )
-    if (USE_PANGO)
-      set (DRIVER_FILES ${DRIVER_FILES} drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx)
-    endif (USE_PANGO)
   else ()
+    if (USE_XFT)
+      set (DRIVER_FILES ${DRIVER_FILES}
+        drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+      )
+      if (USE_PANGO)
+        set (DRIVER_FILES ${DRIVER_FILES} drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx)
+      endif (USE_PANGO)
+    else ()
+      set (DRIVER_FILES ${DRIVER_FILES}
+        drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx
+      )
+    endif (USE_XFT)
     set (DRIVER_FILES ${DRIVER_FILES}
-      drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
+      drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx
     )
-  endif (USE_XFT)
+  endif (FLTK_USE_CAIRO)
 
   set (DRIVER_HEADER_FILES
     drivers/Posix/Fl_Posix_System_Driver.H
     drivers/X11/Fl_X11_Screen_Driver.H
     drivers/X11/Fl_X11_Window_Driver.H
     drivers/X11/Fl_X11_System_Driver.H
+    drivers/Xlib/Fl_Xlib_Graphics_Driver.H
     drivers/Xlib/Fl_Font.H
     drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H
     drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H
     drivers/Unix/Fl_Unix_System_Driver.H
  )
+ if (FLTK_USE_CAIRO)
+   set (DRIVER_HEADER_FILES ${DRIVER_HEADER_FILES}
+     drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+     drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H
+   )
+ elseif (USE_PANGO)
+   set (DRIVER_HEADER_FILES ${DRIVER_HEADER_FILES}
+     drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+   )
+ endif (FLTK_USE_CAIRO)
 
 elseif (OPTION_USE_WAYLAND)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_CURRENT_BINARY_DIR}")
@@ -262,9 +282,18 @@ elseif (OPTION_USE_WAYLAND)
     drivers/Wayland/fl_wayland_clipboard_dnd.cxx
     drivers/Wayland/fl_wayland_platform_init.cxx
     drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+    drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.cxx
     Fl_Native_File_Chooser_FLTK.cxx
     Fl_Native_File_Chooser_GTK.cxx
     Fl_Native_File_Chooser_Kdialog.cxx
+    drivers/X11/Fl_X11_Screen_Driver.cxx
+    drivers/X11/Fl_X11_Window_Driver.cxx
+    drivers/X11/Fl_X11_System_Driver.cxx
+    drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
+    drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
+    Fl_x.cxx
+    fl_dnd_x.cxx
+    Fl_get_key.cxx
   )
   set (DRIVER_HEADER_FILES
     drivers/Posix/Fl_Posix_System_Driver.H
@@ -272,6 +301,8 @@ elseif (OPTION_USE_WAYLAND)
     drivers/Wayland/Fl_Wayland_Screen_Driver.H
     drivers/Wayland/Fl_Wayland_Window_Driver.H
     drivers/Wayland/Fl_Wayland_Graphics_Driver.H
+    drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+    drivers/Cairo/Fl_Display_Cairo_Graphics_Driver.H
     drivers/Wayland/Fl_Wayland_Copy_Surface_Driver.H
     drivers/Wayland/Fl_Wayland_Image_Surface_Driver.H
     drivers/Unix/Fl_Unix_System_Driver.H
@@ -346,7 +377,7 @@ else ()
     drivers/GDI/Fl_GDI_Image_Surface_Driver.H
   )
 
-endif (FLTK_USE_X11)
+endif (FLTK_USE_X11 AND NOT OPTION_USE_WAYLAND)
 
 source_group("Header Files" FILES ${HEADER_FILES})
 source_group("Driver Source Files" FILES ${DRIVER_FILES})
@@ -392,19 +423,22 @@ set (GL_DRIVER_FILES
   drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
   drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
 )
-if (FLTK_USE_X11)
+if (OPTION_USE_WAYLAND)
+  set (GL_DRIVER_FILES ${GL_DRIVER_FILES}
+    drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx
+    drivers/X11/Fl_X11_Gl_Window_Driver.cxx
+    drivers/Wayland/fl_wayland_gl_platform_init.cxx)
+  set (GL_DRIVER_HEADER_FILES drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H drivers/X11/Fl_X11_Gl_Window_Driver.H)
+elseif (FLTK_USE_X11)
   set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/X11/Fl_X11_Gl_Window_Driver.cxx drivers/X11/fl_X11_gl_platform_init.cxx)
   set (GL_DRIVER_HEADER_FILES drivers/X11/Fl_X11_Gl_Window_Driver.H)
-elseif (OPTION_USE_WAYLAND)
-  set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx drivers/Wayland/fl_wayland_gl_platform_init.cxx)
-  set (GL_DRIVER_HEADER_FILES drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H)
 elseif (APPLE)
   set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx drivers/Cocoa/fl_macOS_gl_platform_init.cxx)
   set (GL_DRIVER_HEADER_FILES drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H)
 elseif (WIN32)
   set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.cxx drivers/WinAPI/fl_WinAPI_gl_platform_init.cxx)
   set (GL_DRIVER_HEADER_FILES drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H)
-endif (FLTK_USE_X11)
+endif (OPTION_USE_WAYLAND)
 
 set (GL_DRIVER_HEADER_FILES ${GL_DRIVER_FILES}
   drivers/OpenGL/Fl_OpenGL_Display_Device.H
@@ -621,7 +655,7 @@ if (OPTION_USE_WAYLAND)
   if (OPTION_USE_SYSTEM_LIBDECOR)
     list (APPEND OPTIONAL_LIBS "-ldecor-0")
   endif (OPTION_USE_SYSTEM_LIBDECOR)
-  list (APPEND OPTIONAL_LIBS "-lwayland-cursor -lwayland-client -lxkbcommon -ldl -ldbus-1")
+  list (APPEND OPTIONAL_LIBS "-lwayland-cursor -lwayland-client -lxkbcommon -ldl -ldbus-1 -lXcursor -lXrender -lXinerama -lXfixes -lXft -lXext -lX11")
   if (GTK_FOUND)
     list (APPEND OPTIONAL_LIBS ${GTK_LDFLAGS} )
   endif (GTK_FOUND)