WIP: SDL display support

brndnmtthws · Nov 29, 2022 · 8f1477e · 8f1477e
1 parent ef96807
commit 8f1477e
Show file tree

Hide file tree

Showing 7 changed files with 628 additions and 2 deletions.
diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake
@@ -204,10 +204,14 @@ else(BUILD_X11)
   set(BUILD_NVIDIA false)
 endif(BUILD_X11)
 
+option(BUILD_SDL "Build SDL 1.2 support" false)
+if(BUILD_SDL)
+endif(BUILD_SDL)
+
 # if we build with any GUI support
-if(BUILD_X11)
+if(BUILD_X11 OR BUILD_SDL)
   set(BUILD_GUI true)
-endif(BUILD_X11)
+endif(BUILD_X11 OR BUILD_SDL)
 
 if(OWN_WINDOW)
   option(BUILD_ARGB "Build ARGB (real transparency) support" true)

diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
@@ -393,6 +393,29 @@ if(BUILD_X11)
   endif(BUILD_LUA_RSVG)
 endif(BUILD_X11)
 
+# check for SDL
+if(BUILD_SDL)
+  include(FindSDL)
+  include(FindSDL_ttf)
+  find_package(SDL)
+  if(SDL_FOUND)
+    set(conky_includes ${conky_includes} ${SDL_INCLUDE_DIR})
+    set(conky_libs ${conky_libs} ${SDL_LIBRARIES})
+    find_package(SDL_ttf)
+    if(SDLTTF_FOUND)
+      set(conky_includes ${conky_includes} ${SDL_TTF_INCLUDE_DIR})
+      set(conky_libs ${conky_libs} ${SDL_TTF_LIBRARIES})
+    else(SDLTTL_FOUND)
+      message(FATAL_ERROR "Unable to find SDL_ttf library")
+    endif(SDLTTF_FOUND)
+    check_include_files(SDL_gfxPrimitives.h HAVE_SDL_GFXPRIMITIVES_H)
+    find_library(SDLGFX_LIBRARY SDL_gfx)
+  else(SDL_FOUND)
+    message(FATAL_ERROR "Unable to find SDL library")
+  endif(SDL_FOUND)
+  check_include_files(ftw.h HAVE_FTW_H)
+endif(BUILD_SDL)
+
 if(BUILD_AUDACIOUS)
   set(WANT_GLIB true)
   pkg_check_modules(NEW_AUDACIOUS audacious>=1.4.0)

diff --git a/cmake/config.h.in b/cmake/config.h.in
@@ -29,6 +29,8 @@
 #cmakedefine HAVE_SYS_INOTIFY_H 1
 #cmakedefine HAVE_DIRENT_H 1
 
+#cmakedefine HAVE_FTW_H 1
+
 #cmakedefine HAVE_SOME_SOUNDCARD_H 1
 #cmakedefine HAVE_LINUX_SOUNDCARD_H 1
 
@@ -111,6 +113,8 @@
 
 #cmakedefine BUILD_HTTP 1
 
+#cmakedefine BUILD_SDL 1
+
 #cmakedefine BUILD_GUI 1
 
 #cmakedefine BUILD_ICONV 1

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -118,6 +118,8 @@ set(conky_sources
     display-ncurses.hh
     display-http.cc
     display-http.hh
+    display-sdl.cc
+    display-sdl.hh
     display-x11.cc
     display-x11.hh
     lua-config.cc

diff --git a/src/display-output.cc b/src/display-output.cc
@@ -56,6 +56,7 @@ extern void init_ncurses_output();
 extern void init_file_output();
 extern void init_http_output();
 extern void init_x11_output();
+extern void init_sdl_output();
 
 /*
  * The selected and active display output.
@@ -111,6 +112,7 @@ bool initialize_display_outputs() {
   init_file_output();
   init_http_output();
   init_x11_output();
+  init_sdl_output();
 
   std::vector<display_output_base *> outputs;
   outputs.reserve(display_outputs->size());