Remove navkey support that doesn't actually need to go into libobs. Support arrow keys using key mapping API from the hotkey code.

Author: nleseul

CMakeLists.txt

@@ -43,13 +43,6 @@ if (NOT GHOSTSCRIPT_INCLUDE_DIR OR NOT GHOSTSCRIPT_LIB_DIR)
     message("Ghostscript headers or libraries could not be found! Please ensure that Ghostscript is installed somewhere, and set the GSSourcePath and GSLibraryPath variables if necessary.")
 endif()
 
-# Check if the libobs being referenced has support for arrow key navigation when interacting with a source.
-
-set(CMAKE_REQUIRED_INCLUDES ${OBSSourcePath})
-
-check_c_source_compiles("#include <obs-interaction.h>
-    int main() { struct obs_key_event e; return e.navigation_keys; }" OBS_HAS_NAVKEY_SUPPORT)
-
 configure_file(${CMAKE_SOURCE_DIR}/src/config.h.in ${CMAKE_BINARY_DIR}/config/config.h)
 
 # Source

src/config.h.in

@@ -1,3 +1 @@
 #pragma once
-
-#cmakedefine OBS_HAS_NAVKEY_SUPPORT 1

src/obs-ghostscript.c

@@ -1,4 +1,5 @@
 #include <obs-module.h>
+#include <obs-hotkey.h>
 #include <util/dstr.h>
 
 #include <stdio.h>
@@ -287,20 +288,20 @@ static void pdf_source_key_click(void *data,
 
 	if (!key_up)
 	{
-#ifdef OBS_HAS_NAVKEY_SUPPORT
-		switch (event->navigation_keys)
+		enum obs_key_t key = obs_key_from_virtual_key(event->native_vkey);
+
+		switch (key)
 		{
-			case NAVKEY_DOWN:
-			case NAVKEY_NEXTPAGE:
-				pdf_source_change_page(context, false);
+			case OBS_KEY_UP:
+			case OBS_KEY_PAGEUP:
+				pdf_source_change_page(context, true);
 				break;
 
-			case NAVKEY_UP:
-			case NAVKEY_PREVPAGE:
-				pdf_source_change_page(context, true);
+			case OBS_KEY_DOWN:
+			case OBS_KEY_PAGEDOWN:
+				pdf_source_change_page(context, false);
 				break;
 		}
-#endif
 	}
 }
 
@@ -349,8 +350,8 @@ struct obs_source_info pdf_source_info = {
 	.get_height     = pdf_source_getheight,
 	.video_render   = pdf_source_render,
 	.get_properties = pdf_source_properties,
-	.key_click		= pdf_source_key_click,
-	.mouse_wheel	= pdf_source_mouse_wheel
+	.key_click      = pdf_source_key_click,
+	.mouse_wheel    = pdf_source_mouse_wheel
 };
 
 OBS_DECLARE_MODULE()