Request 5062 (accepted)

obs-studio.changes Changed

@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+Sun Apr 05 21:29:12 UTC 2020 - jimmy@boombatower.com
+
+- Update to version 25.0.4:
+  * libobs: Update version to 25.0.4
+  * win-capture: Update graphics hook version to 1.1.4
+  * UI: Don't stretch server field in Qt 5.14
+  * obs-browser: Fix interact keyboard input on Linux
+  * Decklink: Fix crash when no matching device
+  * libobs: Fix macOS 10.15 hotkey crash (temporary)
+  * win-capture: Fix crash if GPU can't Vulkan capture
+  * docs/sphinx: Bump major OBS version
+  * UI: Use Qt dialogs for Font & Color Pickers on Linux
+  * obs-qsv11: Fix QuickSync LA_ICQ encoder settings
+  * rtmp-services: Remove executable bits from json files
+  * obs-ffmpeg: Expose old NVENC on Windows 7
+  * UI: Fix text handling for dialogs
+  * libobs-winrt: Stronger exception handling
+  * UI: Fix silent scenes with imported SL scenes
+
+-------------------------------------------------------------------
 Tue Mar 24 15:03:52 UTC 2020 - jimmy@boombatower.com
 
 - Update to version 25.0.3:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-25.0.3.tar.xz/UI/forms/OBSBasicSettings.ui -> obs-studio-25.0.4.tar.xz/UI/forms/OBSBasicSettings.ui Changed

obs-studio-25.0.3.tar.xz/UI/importers/sl.cpp -> obs-studio-25.0.4.tar.xz/UI/importers/sl.cpp Changed

obs-studio-25.0.3.tar.xz/UI/properties-view.cpp -> obs-studio-25.0.4.tar.xz/UI/properties-view.cpp Changed

obs-studio-25.0.3.tar.xz/UI/window-basic-main.cpp -> obs-studio-25.0.4.tar.xz/UI/window-basic-main.cpp Changed

obs-studio-25.0.3.tar.xz/UI/window-importer.cpp -> obs-studio-25.0.4.tar.xz/UI/window-importer.cpp Changed

obs-studio-25.0.3.tar.xz/UI/window-remux.cpp -> obs-studio-25.0.4.tar.xz/UI/window-remux.cpp Changed

obs-studio-25.0.3.tar.xz/docs/sphinx/conf.py -> obs-studio-25.0.4.tar.xz/docs/sphinx/conf.py Changed

obs-studio-25.0.3.tar.xz/libobs-winrt/winrt-capture.cpp -> obs-studio-25.0.4.tar.xz/libobs-winrt/winrt-capture.cpp Changed

@@ -18,10 +18,14 @@
 	return winrt::Windows::Foundation::Metadata::ApiInformation::
 		IsApiContractPresent(L"Windows.Foundation.UniversalApiContract",
 				     8);
-} catch (winrt::hresult_error &err) {
+} catch (const winrt::hresult_error &err) {
 	blog(LOG_ERROR, "winrt_capture_supported (0x%08X): %ls", err.to_abi(),
 	     err.message().c_str());
 	return false;
+} catch (...) {
+	blog(LOG_ERROR, "winrt_capture_supported (0x%08X)",
+	     winrt::to_hresult());
+	return false;
 }
 
 extern "C" EXPORT BOOL winrt_capture_cursor_toggle_supported()
@@ -34,10 +38,14 @@
 #else
 	return false;
 #endif
-} catch (winrt::hresult_error &err) {
+} catch (const winrt::hresult_error &err) {
 	blog(LOG_ERROR, "winrt_capture_cursor_toggle_supported (0x%08X): %ls",
 	     err.to_abi(), err.message().c_str());
 	return false;
+} catch (...) {
+	blog(LOG_ERROR, "winrt_capture_cursor_toggle_supported (0x%08X)",
+	     winrt::to_hresult());
+	return false;
 }
 
 template<typename T>
@@ -353,6 +361,10 @@
 		blog(LOG_ERROR, "CreateForWindow (0x%08X): %ls", err.to_abi(),
 		     err.message().c_str());
 		return nullptr;
+	} catch (...) {
+		blog(LOG_ERROR, "CreateForWindow (0x%08X)",
+		     winrt::to_hresult());
+		return nullptr;
 	}
 
 	const winrt::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice
@@ -406,10 +418,13 @@
 
 	return capture;
 
-} catch (winrt::hresult_error &err) {
+} catch (const winrt::hresult_error &err) {
 	blog(LOG_ERROR, "winrt_capture_init (0x%08X): %ls", err.to_abi(),
 	     err.message().c_str());
 	return nullptr;
+} catch (...) {
+	blog(LOG_ERROR, "winrt_capture_init (0x%08X)", winrt::to_hresult());
+	return nullptr;
 }
 
 extern "C" EXPORT void winrt_capture_free(struct winrt_capture *capture)

obs-studio-25.0.3.tar.xz/libobs/obs-cocoa.m -> obs-studio-25.0.4.tar.xz/libobs/obs-cocoa.m Changed

@@ -175,6 +175,8 @@
 	blog(LOG_INFO, "OS Name: %s", name ? name : "Unknown");
 }
 
+static bool using_10_15_or_above = true;
+
 static void log_os_version(id pi, SEL UTF8StringSel)
 {
 	typedef id (*version_func)(id, SEL);
@@ -186,6 +188,16 @@
 	const char *version = UTF8String(vs, UTF8StringSel);
 
 	blog(LOG_INFO, "OS Version: %s", version ? version : "Unknown");
+
+	if (version) {
+		int major;
+		int minor;
+
+		int count = sscanf(version, "Version %d.%d", &major, &minor);
+		if (count == 2 && major == 10) {
+			using_10_15_or_above = minor >= 15;
+		}
+	}
 }
 
 static void log_os(void)
@@ -239,6 +251,7 @@
 
 struct obs_hotkeys_platform {
 	volatile long refs;
+	bool secure_input_activated;
 	TISInputSourceRef tis;
 	CFDataRef layout_data;
 	UCKeyboardLayout *layout;
@@ -1749,6 +1762,14 @@
 	if (key >= OBS_KEY_LAST_VALUE)
 		return false;
 
+	/* if secure input is activated, kill hotkeys.
+	 *
+	 * TODO: rewrite all mac hotkey code, suspect there's a bug in 10.15
+	 * causing the crash internally.  */
+	if (plat->secure_input_activated) {
+		return false;
+	}
+
 	for (size_t i = 0; i < plat->keys[key].num;) {
 		IOHIDElementRef element = plat->keys[key].array[i];
 		IOHIDValueRef value = 0;
@@ -1758,6 +1779,11 @@
 			continue;
 		}
 
+		if (using_10_15_or_above && IsSecureEventInputEnabled()) {
+			plat->secure_input_activated = true;
+			return false;
+		}
+
 		if (IOHIDDeviceGetValue(device, element, &value) !=
 		    kIOReturnSuccess) {
 			i += 1;

obs-studio-25.0.3.tar.xz/libobs/obs-config.h -> obs-studio-25.0.4.tar.xz/libobs/obs-config.h Changed

obs-studio-25.0.3.tar.xz/plugins/decklink/decklink-output.cpp -> obs-studio-25.0.4.tar.xz/plugins/decklink/decklink-output.cpp Changed

obs-studio-25.0.3.tar.xz/plugins/obs-browser/CMakeLists.txt -> obs-studio-25.0.4.tar.xz/plugins/obs-browser/CMakeLists.txt Changed

obs-studio-25.0.4.tar.xz/plugins/obs-browser/linux-keyboard-helpers.hpp Added

@@ -0,0 +1,752 @@
+#pragma once
+
+#define XK_3270
+#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
+
+#ifndef VKEY_UNKNOWN
+
+#define VKEY_UNKNOWN 0
+
+// POSIX specific VKEYs. Note that as of Windows SDK 7.1, 0x97-9F, 0xD8-DA,
+// and 0xE8 are unassigned.
+#define VKEY_WLAN 0x97
+#define VKEY_POWER 0x98
+#define VKEY_BRIGHTNESS_DOWN 0xD8
+#define VKEY_BRIGHTNESS_UP 0xD9
+#define VKEY_KBD_BRIGHTNESS_DOWN 0xDA
+#define VKEY_KBD_BRIGHTNESS_UP 0xE8
+
+// Windows does not have a specific key code for AltGr. We use the unused 0xE1
+// (VK_OEM_AX) code to represent AltGr, matching the behaviour of Firefox on
+// Linux.
+#define VKEY_ALTGR 0xE1
+// Windows does not have a specific key code for Compose. We use the unused
+// 0xE6 (VK_ICO_CLEAR) code to represent Compose.
+#define VKEY_COMPOSE 0xE6
+
+// Left mouse button
+#ifndef VKEY_LBUTTON
+#define VKEY_LBUTTON 0x01
+#endif
+// Right mouse button
+#ifndef VKEY_RBUTTON
+#define VKEY_RBUTTON 0x02
+#endif
+// Middle mouse button (three-button mouse)
+#ifndef VKEY_MBUTTON
+#define VKEY_MBUTTON 0x04
+#endif
+#ifndef VKEY_XBUTTON1
+#define VKEY_XBUTTON1 0x05
+#endif
+#ifndef VKEY_XBUTTON2
+#define VKEY_XBUTTON2 0x06
+#endif
+
+#ifndef VKEY_BACK
+#define VKEY_BACK 0x08
+#endif
+#ifndef VKEY_TAB
+#define VKEY_TAB 0x09
+#endif
+#ifndef VKEY_CLEAR
+#define VKEY_CLEAR 0x0C
+#endif
+#ifndef VKEY_RETURN
+#define VKEY_RETURN 0x0D
+#endif
+#ifndef VKEY_SHIFT
+#define VKEY_SHIFT 0x10
+#endif
+#ifndef VKEY_CONTROL
+#define VKEY_CONTROL 0x11 // CTRL key
+#endif
+#ifndef VKEY_MENU
+#define VKEY_MENU 0x12 // ALT key
+#endif
+#ifndef VKEY_PAUSE
+#define VKEY_PAUSE 0x13 // PAUSE key
+#endif
+#ifndef VKEY_CAPITAL
+#define VKEY_CAPITAL 0x14 // CAPS LOCK key
+#endif
+#ifndef VKEY_KANA
+#define VKEY_KANA 0x15 // Input Method Editor (IME) Kana mode
+#endif
+#ifndef VKEY_HANGUL
+#define VKEY_HANGUL 0x15 // IME Hangul mode
+#endif
+#ifndef VKEY_JUNJA
+#define VKEY_JUNJA 0x17 // IME Junja mode
+#endif
+#ifndef VKEY_FINAL
+#define VKEY_FINAL 0x18 // IME final mode
+#endif
+#ifndef VKEY_HANJA
+#define VKEY_HANJA 0x19 // IME Hanja mode
+#endif
+#ifndef VKEY_KANJI
+#define VKEY_KANJI 0x19 // IME Kanji mode
+#endif
+#ifndef VKEY_ESCAPE
+#define VKEY_ESCAPE 0x1B // ESC key
+#endif
+#ifndef VKEY_CONVERT
+#define VKEY_CONVERT 0x1C // IME convert
+#endif
+#ifndef VKEY_NONCONVERT
+#define VKEY_NONCONVERT 0x1D // IME nonconvert
+#endif
+#ifndef VKEY_ACCEPT
+#define VKEY_ACCEPT 0x1E // IME accept
+#endif
+#ifndef VKEY_MODECHANGE
+#define VKEY_MODECHANGE 0x1F // IME mode change request
+#endif
+#ifndef VKEY_SPACE
+#define VKEY_SPACE 0x20 // SPACE key
+#endif
+#ifndef VKEY_PRIOR
+#define VKEY_PRIOR 0x21 // PAGE UP key
+#endif
+#ifndef VKEY_NEXT
+#define VKEY_NEXT 0x22 // PAGE DOWN key
+#endif
+#ifndef VKEY_END
+#define VKEY_END 0x23 // END key
+#endif
+#ifndef VKEY_HOME
+#define VKEY_HOME 0x24 // HOME key
+#endif
+#ifndef VKEY_LEFT
+#define VKEY_LEFT 0x25 // LEFT ARROW key
+#endif
+#ifndef VKEY_UP
+#define VKEY_UP 0x26 // UP ARROW key
+#endif
+#ifndef VKEY_RIGHT
+#define VKEY_RIGHT 0x27 // RIGHT ARROW key
+#endif
+#ifndef VKEY_DOWN
+#define VKEY_DOWN 0x28 // DOWN ARROW key
+#endif
+#ifndef VKEY_SELECT
+#define VKEY_SELECT 0x29 // SELECT key
+#endif
+#ifndef VKEY_PRINT
+#define VKEY_PRINT 0x2A // PRINT key
+#endif
+#ifndef VKEY_EXECUTE
+#define VKEY_EXECUTE 0x2B // EXECUTE key
+#endif
+#ifndef VKEY_SNAPSHOT
+#define VKEY_SNAPSHOT 0x2C // PRINT SCREEN key
+#endif
+#ifndef VKEY_INSERT
+#define VKEY_INSERT 0x2D // INS key
+#endif
+#ifndef VKEY_DELETE
+#define VKEY_DELETE 0x2E // DEL key
+#endif
+#ifndef VKEY_HELP
+#define VKEY_HELP 0x2F // HELP key
+#endif
+
+#define VKEY_0 0x30
+#define VKEY_1 0x31
+#define VKEY_2 0x32
+#define VKEY_3 0x33
+#define VKEY_4 0x34
+#define VKEY_5 0x35
+#define VKEY_6 0x36
+#define VKEY_7 0x37
+#define VKEY_8 0x38
+#define VKEY_9 0x39
+#define VKEY_A 0x41
+#define VKEY_B 0x42
+#define VKEY_C 0x43
+#define VKEY_D 0x44
+#define VKEY_E 0x45
+#define VKEY_F 0x46
+#define VKEY_G 0x47
+#define VKEY_H 0x48
+#define VKEY_I 0x49
+#define VKEY_J 0x4A
+#define VKEY_K 0x4B
+#define VKEY_L 0x4C
+#define VKEY_M 0x4D
+#define VKEY_N 0x4E
+#define VKEY_O 0x4F
+#define VKEY_P 0x50
+#define VKEY_Q 0x51
+#define VKEY_R 0x52
+#define VKEY_S 0x53
+#define VKEY_T 0x54
+#define VKEY_U 0x55
+#define VKEY_V 0x56
+#define VKEY_W 0x57
+#define VKEY_X 0x58
+#define VKEY_Y 0x59
+#define VKEY_Z 0x5A
+
+#define VKEY_LWIN 0x5B // Left Windows key (Microsoft Natural keyboard)
+
+#define VKEY_RWIN 0x5C // Right Windows key (Natural keyboard)
+
+#define VKEY_APPS 0x5D // Applications key (Natural keyboard)
+
+#define VKEY_SLEEP 0x5F // Computer Sleep key
+
+// Num pad keys
+#define VKEY_NUMPAD0 0x60
+#define VKEY_NUMPAD1 0x61
+#define VKEY_NUMPAD2 0x62
+#define VKEY_NUMPAD3 0x63
+#define VKEY_NUMPAD4 0x64
+#define VKEY_NUMPAD5 0x65
+#define VKEY_NUMPAD6 0x66
+#define VKEY_NUMPAD7 0x67
+#define VKEY_NUMPAD8 0x68
+#define VKEY_NUMPAD9 0x69
+#define VKEY_MULTIPLY 0x6A
+#define VKEY_ADD 0x6B
+#define VKEY_SEPARATOR 0x6C
+#define VKEY_SUBTRACT 0x6D
+#define VKEY_DECIMAL 0x6E
+#define VKEY_DIVIDE 0x6F
+
+#define VKEY_F1 0x70
+#define VKEY_F2 0x71
+#define VKEY_F3 0x72
+#define VKEY_F4 0x73
+#define VKEY_F5 0x74
+#define VKEY_F6 0x75
+#define VKEY_F7 0x76
+#define VKEY_F8 0x77
+#define VKEY_F9 0x78
+#define VKEY_F10 0x79
+#define VKEY_F11 0x7A
+#define VKEY_F12 0x7B
+#define VKEY_F13 0x7C
+#define VKEY_F14 0x7D
+#define VKEY_F15 0x7E
+#define VKEY_F16 0x7F
+#define VKEY_F17 0x80
+#define VKEY_F18 0x81
+#define VKEY_F19 0x82
+#define VKEY_F20 0x83
+#define VKEY_F21 0x84
+#define VKEY_F22 0x85
+#define VKEY_F23 0x86
+#define VKEY_F24 0x87
+
+#define VKEY_NUMLOCK 0x90
+#define VKEY_SCROLL 0x91
+#define VKEY_LSHIFT 0xA0
+#define VKEY_RSHIFT 0xA1
+#define VKEY_LCONTROL 0xA2
+#define VKEY_RCONTROL 0xA3
+#define VKEY_LMENU 0xA4
+#define VKEY_RMENU 0xA5
+
+#define VKEY_BROWSER_BACK 0xA6      // Windows 2000/XP: Browser Back key
+#define VKEY_BROWSER_FORWARD 0xA7   // Windows 2000/XP: Browser Forward key
+#define VKEY_BROWSER_REFRESH 0xA8   // Windows 2000/XP: Browser Refresh key
+#define VKEY_BROWSER_STOP 0xA9      // Windows 2000/XP: Browser Stop key
+#define VKEY_BROWSER_SEARCH 0xAA    // Windows 2000/XP: Browser Search key
+#define VKEY_BROWSER_FAVORITES 0xAB // Windows 2000/XP: Browser Favorites key
+#define VKEY_BROWSER_HOME 0xAC // Windows 2000/XP: Browser Start and Home key
+#define VKEY_VOLUME_MUTE 0xAD  // Windows 2000/XP: Volume Mute key
+#define VKEY_VOLUME_DOWN 0xAE  // Windows 2000/XP: Volume Down key
+#define VKEY_VOLUME_UP 0xAF    // Windows 2000/XP: Volume Up key
+#define VKEY_MEDIA_NEXT_TRACK 0xB0  // Windows 2000/XP: Next Track key
+#define VKEY_MEDIA_PREV_TRACK 0xB1  // Windows 2000/XP: Previous Track key
+#define VKEY_MEDIA_STOP 0xB2        // Windows 2000/XP: Stop Media key
+#define VKEY_MEDIA_PLAY_PAUSE 0xB3  // Windows 2000/XP: Play/Pause Media key
+#define VKEY_MEDIA_LAUNCH_MAIL 0xB4 // Windows 2000/XP: Start Mail key
+#define VKEY_MEDIA_LAUNCH_MEDIA_SELECT 0xB5 // Windows 2000/XP: Select Media key
+#define VKEY_MEDIA_LAUNCH_APP1 \
+	0xB6 // VKEY_LAUNCH_APP1 (B6) Windows 2000/XP: Start Application 1 key
+#define VKEY_MEDIA_LAUNCH_APP2 \
+	0xB7 // VKEY_LAUNCH_APP2 (B7) Windows 2000/XP: Start Application 2 key
+
+// VKEY_OEM_1 (BA) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the ';:' key
+#define VKEY_OEM_1 0xBA
+
+// Windows 2000/XP: For any country/region, the '+' key
+#define VKEY_OEM_PLUS 0xBB
+
+// Windows 2000/XP: For any country/region, the ',' key
+#define VKEY_OEM_COMMA 0xBC
+
+// Windows 2000/XP: For any country/region, the '-' key
+#define VKEY_OEM_MINUS 0xBD
+
+// Windows 2000/XP: For any country/region, the '.' key
+#define VKEY_OEM_PERIOD 0xBE
+
+// VKEY_OEM_2 (BF) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the '/?' key
+#define VKEY_OEM_2 0xBF
+
+// VKEY_OEM_3 (C0) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the '`~' key
+#define VKEY_OEM_3 0xC0
+
+// VKEY_OEM_4 (DB) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the '[{' key
+#define VKEY_OEM_4 0xDB
+
+// VKEY_OEM_5 (DC) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the '\|' key
+#define VKEY_OEM_5 0xDC
+
+// VKEY_OEM_6 (DD) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the ']}' key
+#define VKEY_OEM_6 0xDD
+
+// VKEY_OEM_7 (DE) Used for miscellaneous characters; it can vary by keyboard.
+// Windows 2000/XP: For the US standard keyboard, the
+// 'single-quote/double-quote' key
+#define VKEY_OEM_7 0xDE
+
+// VKEY_OEM_8 (DF) Used for miscellaneous characters; it can vary by keyboard.
+#define VKEY_OEM_8 0xDF
+
+// VKEY_OEM_102 (E2) Windows 2000/XP: Either the angle bracket key or the
+// backslash key on the RT 102-key keyboard
+#define VKEY_OEM_102 0xE2
+
+#define VKEY_OEM_BACKTAB 0xF5
+#define VKEY_OEM_FJ_TOUROKU 0x94
+#define VKEY_OEM_FJ_MASSHOU 0x93
+
+// Windows 95/98/Me, Windows NT 4.0, Windows 2000/XP: IME PROCESS key
+#define VKEY_PROCESSKEY 0xE5
+
+// Windows 2000/XP: Used to pass Unicode characters as if they were keystrokes.
+// The VKEY_PACKET key is the low word of a 32-bit Virtual Key value used for
+// non-keyboard input methods. For more information, see Remark in
+// KEYBDINPUT,SendInput, WM_KEYDOWN, and WM_KEYUP
+#define VKEY_PACKET 0xE7
+
+#define VKEY_ATTN 0xF6  // Attn key
+#define VKEY_CRSEL 0xF7 // CrSel key
+#define VKEY_EXSEL 0xF8 // ExSel key
+#define VKEY_EREOF 0xF9 // Erase EOF key
+#define VKEY_PLAY 0xFA  // Play key
+#define VKEY_ZOOM 0xFB  // Zoom key
+
+#define VKEY_NONAME 0xFC // Reserved for future use
+
+#define VKEY_PA1 0xFD // VKEY_PA1 (FD) PA1 key
+
+#define VKEY_OEM_CLEAR 0xFE // Clear key
+
+#endif // VKEY_UNKNOWN
+
+/* ------------------------------------------------------------------------- */
+
+static uint32_t KeyboardCodeFromXKeysym(unsigned int keysym)
+{
+	switch (keysym) {
+	case XK_BackSpace:
+		return VKEY_BACK;
+	case XK_Delete:
+	case XK_KP_Delete:
+		return VKEY_DELETE;
+	case XK_Tab:
+	case XK_KP_Tab:
+	case XK_ISO_Left_Tab:
+	case XK_3270_BackTab:
+		return VKEY_TAB;
+	case XK_Linefeed:
+	case XK_Return:
+	case XK_KP_Enter:
+	case XK_ISO_Enter:
+		return VKEY_RETURN;
+	case XK_Clear:
+	case XK_KP_Begin: // NumPad 5 without Num Lock, for crosbug.com/29169.
+		return VKEY_CLEAR;
+	case XK_KP_Space:
+	case XK_space:
+		return VKEY_SPACE;
+	case XK_Home:
+	case XK_KP_Home:
+		return VKEY_HOME;
+	case XK_End:
+	case XK_KP_End:
+		return VKEY_END;
+	case XK_Page_Up:
+	case XK_KP_Page_Up: // aka XK_KP_Prior
+		return VKEY_PRIOR;
+	case XK_Page_Down:
+	case XK_KP_Page_Down: // aka XK_KP_Next
+		return VKEY_NEXT;
+	case XK_Left:
+	case XK_KP_Left:
+		return VKEY_LEFT;
+	case XK_Right:
+	case XK_KP_Right:
+		return VKEY_RIGHT;
+	case XK_Down:
+	case XK_KP_Down:
+		return VKEY_DOWN;
+	case XK_Up:
+	case XK_KP_Up:
+		return VKEY_UP;
+	case XK_Escape:
+		return VKEY_ESCAPE;
+	case XK_Kana_Lock:
+	case XK_Kana_Shift:
+		return VKEY_KANA;
+	case XK_Hangul:
+		return VKEY_HANGUL;
+	case XK_Hangul_Hanja:
+		return VKEY_HANJA;
+	case XK_Kanji:
+		return VKEY_KANJI;
+	case XK_Henkan:
+		return VKEY_CONVERT;
+	case XK_Muhenkan:
+		return VKEY_NONCONVERT;
+	case XK_A:
+	case XK_a:
+		return VKEY_A;
+	case XK_B:
+	case XK_b:
+		return VKEY_B;
+	case XK_C:
+	case XK_c:
+		return VKEY_C;
+	case XK_D:
+	case XK_d:
+		return VKEY_D;
+	case XK_E:
+	case XK_e:
+		return VKEY_E;
+	case XK_F:
+	case XK_f:
+		return VKEY_F;
+	case XK_G:
+	case XK_g:
+		return VKEY_G;
+	case XK_H:
+	case XK_h:
+		return VKEY_H;
+	case XK_I:
+	case XK_i:
+		return VKEY_I;
+	case XK_J:
+	case XK_j:
+		return VKEY_J;
+	case XK_K:
+	case XK_k:
+		return VKEY_K;
+	case XK_L:
+	case XK_l:
+		return VKEY_L;
+	case XK_M:
+	case XK_m:
+		return VKEY_M;
+	case XK_N:
+	case XK_n:
+		return VKEY_N;
+	case XK_O:
+	case XK_o:
+		return VKEY_O;
+	case XK_P:
+	case XK_p:
+		return VKEY_P;
+	case XK_Q:
+	case XK_q:
+		return VKEY_Q;
+	case XK_R:
+	case XK_r:
+		return VKEY_R;
+	case XK_S:
+	case XK_s:
+		return VKEY_S;
+	case XK_T:
+	case XK_t:
+		return VKEY_T;
+	case XK_U:
+	case XK_u:
+		return VKEY_U;
+	case XK_V:
+	case XK_v:
+		return VKEY_V;
+	case XK_W:
+	case XK_w:
+		return VKEY_W;
+	case XK_X:
+	case XK_x:
+		return VKEY_X;
+	case XK_Y:
+	case XK_y:
+		return VKEY_Y;
+	case XK_Z:
+	case XK_z:
+		return VKEY_Z;
+
+	case XK_0:
+	case XK_1:
+	case XK_2:
+	case XK_3:
+	case XK_4:
+	case XK_5:
+	case XK_6:
+	case XK_7:
+	case XK_8:
+	case XK_9:
+		return static_cast<unsigned int>(VKEY_0 + (keysym - XK_0));
+
+	case XK_parenright:
+		return VKEY_0;
+	case XK_exclam:
+		return VKEY_1;
+	case XK_at:
+		return VKEY_2;
+	case XK_numbersign:
+		return VKEY_3;
+	case XK_dollar:
+		return VKEY_4;
+	case XK_percent:
+		return VKEY_5;
+	case XK_asciicircum:
+		return VKEY_6;
+	case XK_ampersand:
+		return VKEY_7;
+	case XK_asterisk:
+		return VKEY_8;
+	case XK_parenleft:
+		return VKEY_9;
+
+	case XK_KP_0:
+	case XK_KP_1:
+	case XK_KP_2:
+	case XK_KP_3:
+	case XK_KP_4:
+	case XK_KP_5:
+	case XK_KP_6:
+	case XK_KP_7:
+	case XK_KP_8:
+	case XK_KP_9:
+		return static_cast<unsigned int>(VKEY_NUMPAD0 +
+						 (keysym - XK_KP_0));
+
+	case XK_multiply:
+	case XK_KP_Multiply:
+		return VKEY_MULTIPLY;
+	case XK_KP_Add:
+		return VKEY_ADD;
+	case XK_KP_Separator:
+		return VKEY_SEPARATOR;
+	case XK_KP_Subtract:
+		return VKEY_SUBTRACT;
+	case XK_KP_Decimal:
+		return VKEY_DECIMAL;
+	case XK_KP_Divide:
+		return VKEY_DIVIDE;
+	case XK_KP_Equal:
+	case XK_equal:
+	case XK_plus:
+		return VKEY_OEM_PLUS;
+	case XK_comma:
+	case XK_less:
+		return VKEY_OEM_COMMA;
+	case XK_minus:
+	case XK_underscore:
+		return VKEY_OEM_MINUS;
+	case XK_greater:
+	case XK_period:
+		return VKEY_OEM_PERIOD;
+	case XK_colon:
+	case XK_semicolon:
+		return VKEY_OEM_1;
+	case XK_question:
+	case XK_slash:
+		return VKEY_OEM_2;
+	case XK_asciitilde:
+	case XK_quoteleft:
+		return VKEY_OEM_3;
+	case XK_bracketleft:
+	case XK_braceleft:
+		return VKEY_OEM_4;
+	case XK_backslash:
+	case XK_bar:
+		return VKEY_OEM_5;
+	case XK_bracketright:
+	case XK_braceright:
+		return VKEY_OEM_6;
+	case XK_quoteright:
+	case XK_quotedbl:
+		return VKEY_OEM_7;
+	case XK_ISO_Level5_Shift:
+		return VKEY_OEM_8;
+	case XK_Shift_L:
+	case XK_Shift_R:
+		return VKEY_SHIFT;
+	case XK_Control_L:
+	case XK_Control_R:
+		return VKEY_CONTROL;
+	case XK_Meta_L:
+	case XK_Meta_R:
+	case XK_Alt_L:
+	case XK_Alt_R:
+		return VKEY_MENU;
+	case XK_ISO_Level3_Shift:
+		return VKEY_ALTGR;
+	case XK_Multi_key:
+		return VKEY_COMPOSE;
+	case XK_Pause:
+		return VKEY_PAUSE;
+	case XK_Caps_Lock:
+		return VKEY_CAPITAL;
+	case XK_Num_Lock:
+		return VKEY_NUMLOCK;
+	case XK_Scroll_Lock:
+		return VKEY_SCROLL;
+	case XK_Select:
+		return VKEY_SELECT;
+	case XK_Print:
+		return VKEY_PRINT;
+	case XK_Execute:
+		return VKEY_EXECUTE;
+	case XK_Insert:
+	case XK_KP_Insert:
+		return VKEY_INSERT;
+	case XK_Help:
+		return VKEY_HELP;
+	case XK_Super_L:
+		return VKEY_LWIN;
+	case XK_Super_R:
+		return VKEY_RWIN;
+	case XK_Menu:
+		return VKEY_APPS;
+	case XK_F1:
+	case XK_F2:
+	case XK_F3:
+	case XK_F4:
+	case XK_F5:
+	case XK_F6:
+	case XK_F7:
+	case XK_F8:
+	case XK_F9:
+	case XK_F10:
+	case XK_F11:
+	case XK_F12:
+	case XK_F13:
+	case XK_F14:
+	case XK_F15:
+	case XK_F16:
+	case XK_F17:
+	case XK_F18:
+	case XK_F19:
+	case XK_F20:
+	case XK_F21:
+	case XK_F22:
+	case XK_F23:
+	case XK_F24:
+		return static_cast<unsigned int>(VKEY_F1 + (keysym - XK_F1));
+	case XK_KP_F1:
+	case XK_KP_F2:
+	case XK_KP_F3:
+	case XK_KP_F4:
+		return static_cast<unsigned int>(VKEY_F1 + (keysym - XK_KP_F1));
+
+	case XK_guillemotleft:
+	case XK_guillemotright:
+	case XK_degree:
+	// In the case of canadian multilingual keyboard layout, VKEY_OEM_102
+	// is assigned to ugrave key.
+	case XK_ugrave:
+	case XK_Ugrave:
+	case XK_brokenbar:
+		return VKEY_OEM_102; // international backslash key in 102
+			// keyboard.
+
+	// When evdev is in use, /usr/share/X11/xkb/symbols/inet maps F13-18
+	// keys to the special XF86XK symbols to support Microsoft Ergonomic
+	// keyboards: https://bugs.freedesktop.org/show_bug.cgi?id=5783 In
+	// Chrome, we map these X key symbols back to F13-18 since we don't
+	// have VKEYs for these XF86XK symbols.
+	case XF86XK_Tools:
+		return VKEY_F13;
+	case XF86XK_Launch5:
+		return VKEY_F14;
+	case XF86XK_Launch6:
+		return VKEY_F15;
+	case XF86XK_Launch7:
+		return VKEY_F16;
+	case XF86XK_Launch8:
+		return VKEY_F17;
+	case XF86XK_Launch9:
+		return VKEY_F18;
+	case XF86XK_Refresh:
+	case XF86XK_History:
+	case XF86XK_OpenURL:
+	case XF86XK_AddFavorite:
+	case XF86XK_Go:
+	case XF86XK_ZoomIn:
+	case XF86XK_ZoomOut:
+		// ui::AcceleratorGtk tries to convert the XF86XK_ keysyms on
+		// Chrome startup. It's safe to return VKEY_UNKNOWN here since
+		// ui::AcceleratorGtk also checks a Gdk keysym.
+		// http://crbug.com/109843
+		return VKEY_UNKNOWN;
+	// For supporting multimedia buttons on a USB keyboard.
+	case XF86XK_Back:
+		return VKEY_BROWSER_BACK;
+	case XF86XK_Forward:
+		return VKEY_BROWSER_FORWARD;
+	case XF86XK_Reload:
+		return VKEY_BROWSER_REFRESH;
+	case XF86XK_Stop:
+		return VKEY_BROWSER_STOP;
+	case XF86XK_Search:
+		return VKEY_BROWSER_SEARCH;
+	case XF86XK_Favorites:
+		return VKEY_BROWSER_FAVORITES;
+	case XF86XK_HomePage:
+		return VKEY_BROWSER_HOME;
+	case XF86XK_AudioMute:
+		return VKEY_VOLUME_MUTE;
+	case XF86XK_AudioLowerVolume:
+		return VKEY_VOLUME_DOWN;
+	case XF86XK_AudioRaiseVolume:
+		return VKEY_VOLUME_UP;
+	case XF86XK_AudioNext:
+		return VKEY_MEDIA_NEXT_TRACK;
+	case XF86XK_AudioPrev:
+		return VKEY_MEDIA_PREV_TRACK;
+	case XF86XK_AudioStop:
+		return VKEY_MEDIA_STOP;
+	case XF86XK_AudioPlay:
+		return VKEY_MEDIA_PLAY_PAUSE;
+	case XF86XK_Mail:
+		return VKEY_MEDIA_LAUNCH_MAIL;
+	case XF86XK_LaunchA: // F3 on an Apple keyboard.
+		return VKEY_MEDIA_LAUNCH_APP1;
+	case XF86XK_LaunchB: // F4 on an Apple keyboard.
+	case XF86XK_Calculator:
+		return VKEY_MEDIA_LAUNCH_APP2;
+	case XF86XK_WLAN:
+		return VKEY_WLAN;
+	case XF86XK_PowerOff:
+		return VKEY_POWER;
+	case XF86XK_MonBrightnessDown:
+		return VKEY_BRIGHTNESS_DOWN;
+	case XF86XK_MonBrightnessUp:
+		return VKEY_BRIGHTNESS_UP;
+	case XF86XK_KbdBrightnessDown:
+		return VKEY_KBD_BRIGHTNESS_DOWN;
+	case XF86XK_KbdBrightnessUp:
+		return VKEY_KBD_BRIGHTNESS_UP;
+
+		// TODO(sad): some keycodes are still missing.
+	}
+	return VKEY_UNKNOWN;
+}

obs-studio-25.0.3.tar.xz/plugins/obs-browser/obs-browser-source.cpp -> obs-studio-25.0.4.tar.xz/plugins/obs-browser/obs-browser-source.cpp Changed

@@ -28,6 +28,10 @@
 #include <thread>
 #include <mutex>
 
+#ifdef __linux__
+#include "linux-keyboard-helpers.hpp"
+#endif
+
 #ifdef USE_QT_LOOP
 #include <QEventLoop>
 #include <QThread>
@@ -294,13 +298,19 @@
 {
 	uint32_t modifiers = event->modifiers;
 	std::string text = event->text;
+#ifdef __linux__
+	uint32_t native_vkey = KeyboardCodeFromXKeysym(event->native_vkey);
+#else
 	uint32_t native_vkey = event->native_vkey;
+#endif
+	uint32_t native_scancode = event->native_scancode;
+	uint32_t native_modifiers = event->native_modifiers;
 
 	ExecuteOnBrowser(
 		[=](CefRefPtr<CefBrowser> cefBrowser) {
 			CefKeyEvent e;
 			e.windows_key_code = native_vkey;
-			e.native_key_code = 0;
+			e.native_key_code = native_scancode;
 
 			e.type = key_up ? KEYEVENT_KEYUP : KEYEVENT_RAWKEYDOWN;
 
@@ -311,13 +321,18 @@
 			}
 
 			//e.native_key_code = native_vkey;
-			e.modifiers = modifiers;
+			e.modifiers = native_modifiers;
 
 			cefBrowser->GetHost()->SendKeyEvent(e);
 			if (!text.empty() && !key_up) {
 				e.type = KEYEVENT_CHAR;
+#ifdef __linux__
+				e.windows_key_code =
+					KeyboardCodeFromXKeysym(e.character);
+#else
 				e.windows_key_code = e.character;
-				e.native_key_code = native_vkey;
+#endif
+				e.native_key_code = native_scancode;
 				cefBrowser->GetHost()->SendKeyEvent(e);
 			}
 		},

obs-studio-25.0.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg.c -> obs-studio-25.0.4.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg.c Changed

obs-studio-25.0.3.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp -> obs-studio-25.0.4.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp Changed

obs-studio-25.0.3.tar.xz/plugins/win-capture/graphics-hook-ver.h -> obs-studio-25.0.4.tar.xz/plugins/win-capture/graphics-hook-ver.h Changed

obs-studio-25.0.3.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.c -> obs-studio-25.0.4.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.c Changed

@@ -1181,18 +1181,17 @@
 }
 
 static VkResult VKAPI OBS_CreateDevice(VkPhysicalDevice phy_device,
-				       const VkDeviceCreateInfo *cinfo,
+				       const VkDeviceCreateInfo *info,
 				       const VkAllocationCallbacks *ac,
 				       VkDevice *p_device)
 {
-	VkDeviceCreateInfo info = *cinfo;
 	struct vk_inst_data *idata = get_inst_data(phy_device);
 	struct vk_inst_funcs *ifuncs = &idata->funcs;
 	struct vk_data *data = NULL;
 
 	VkResult ret = VK_ERROR_INITIALIZATION_FAILED;
 
-	VkLayerDeviceCreateInfo *ldci = (void *)info.pNext;
+	VkLayerDeviceCreateInfo *ldci = (void *)info->pNext;
 
 	/* -------------------------------------------------------- */
 	/* step through chain until we get to the link info         */
@@ -1222,8 +1221,7 @@
 	PFN_vkCreateDevice createFunc =
 		(PFN_vkCreateDevice)gipa(VK_NULL_HANDLE, "vkCreateDevice");
 
-	ret = createFunc(phy_device, idata->valid ? &info : cinfo, ac,
-			 p_device);
+	ret = createFunc(phy_device, info, ac, p_device);
 	if (ret != VK_SUCCESS) {
 		goto fail;
 	}
@@ -1291,6 +1289,7 @@
 	if (funcs_not_found) {
 		goto fail;
 	}
+
 	if (!idata->valid) {
 		flog("instance not valid");
 		goto fail;
@@ -1320,11 +1319,15 @@
 	if (!data)
 		return;
 
-	for (uint32_t fam_idx = 0; fam_idx < _countof(data->cmd_pools);
-	     fam_idx++) {
-		struct vk_cmd_pool_data *pool_data = &data->cmd_pools[fam_idx];
-		if (pool_data->cmd_pool != VK_NULL_HANDLE) {
-			vk_shtex_destroy_cmd_pool_objects(data, pool_data);
+	if (data->valid) {
+		for (uint32_t fam_idx = 0; fam_idx < _countof(data->cmd_pools);
+		     fam_idx++) {
+			struct vk_cmd_pool_data *pool_data =
+				&data->cmd_pools[fam_idx];
+			if (pool_data->cmd_pool != VK_NULL_HANDLE) {
+				vk_shtex_destroy_cmd_pool_objects(data,
+								  pool_data);
+			}
 		}
 	}
 
@@ -1339,15 +1342,17 @@
 		       const VkAllocationCallbacks *ac, VkSwapchainKHR *p_sc)
 {
 	struct vk_data *data = get_device_data(device);
-	struct vk_device_funcs *funcs = &data->funcs;
 
 	VkSwapchainCreateInfoKHR info = *cinfo;
-	info.imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+	if (data->valid)
+		info.imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
 
+	struct vk_device_funcs *funcs = &data->funcs;
 	VkResult res = funcs->CreateSwapchainKHR(device, &info, ac, p_sc);
 	debug_res("CreateSwapchainKHR", res);
-	if (res != VK_SUCCESS)
+	if ((res != VK_SUCCESS) || !data->valid)
 		return res;
+
 	VkSwapchainKHR sc = *p_sc;
 
 	uint32_t count = 0;
@@ -1379,14 +1384,16 @@
 	struct vk_data *data = get_device_data(device);
 	struct vk_device_funcs *funcs = &data->funcs;
 
-	struct vk_swap_data *swap = get_swap_data(data, sc);
-	if (swap) {
-		if (data->cur_swap == swap) {
-			vk_shtex_free(data);
+	if (data->valid) {
+		struct vk_swap_data *swap = get_swap_data(data, sc);
+		if (swap) {
+			if (data->cur_swap == swap) {
+				vk_shtex_free(data);
+			}
+
+			swap->sc = VK_NULL_HANDLE;
+			swap->hwnd = NULL;
 		}
-
-		swap->sc = VK_NULL_HANDLE;
-		swap->hwnd = NULL;
 	}
 
 	funcs->DestroySwapchainKHR(device, sc, ac);

Overview

Request 5062 (accepted)

Request History