frontend: Add Input Monitoring to permissions dialog

The previous commit switched global hotkeys from requiring Accessibility
to just Input Monitoring permissions. This adds the matching changes to
the permissions dialog, also accounting for the fact that Accessibility
includes Input Monitoring.

frontend/data/locale/en-US.ini

@@ -510,8 +510,10 @@ MacPermissions.Item.Camera="Camera"
 MacPermissions.Item.Camera.Details="This permission is needed in order to capture content from a webcam or capture card."
 MacPermissions.Item.Microphone="Microphone"
 MacPermissions.Item.Microphone.Details="OBS requires this permission if you want to capture your microphone or an external audio device."
+MacPermissions.Item.InputMonitoring="Input Monitoring"
+MacPermissions.Item.InputMonitoring.Details="This permission is required for hotkeys to work while OBS is in the background."
 MacPermissions.Item.Accessibility="Accessibility"
-MacPermissions.Item.Accessibility.Details="For keyboard shortcuts (hotkeys) to work while other apps are focused, please enable this permission."
+MacPermissions.Item.Accessibility.Details="On older installations, OBS may be listed in \"Accessibility\" instead of \"Input Monitoring\"."
 MacPermissions.Continue="Continue"
 
 # Source leak error message

frontend/dialogs/OBSPermissions.cpp

@@ -22,7 +22,7 @@
 #include "moc_OBSPermissions.cpp"
 
 OBSPermissions::OBSPermissions(QWidget *parent, MacPermissionStatus capture, MacPermissionStatus video,
-			       MacPermissionStatus audio, MacPermissionStatus accessibility)
+			       MacPermissionStatus audio, MacPermissionStatus inputMonitoring)
 	: QDialog(parent),
 	  ui(new Ui::OBSPermissions)
 {
@@ -30,7 +30,12 @@ OBSPermissions::OBSPermissions(QWidget *parent, MacPermissionStatus capture, Mac
 	SetStatus(ui->capturePermissionButton, capture, QTStr("MacPermissions.Item.ScreenRecording"));
 	SetStatus(ui->videoPermissionButton, video, QTStr("MacPermissions.Item.Camera"));
 	SetStatus(ui->audioPermissionButton, audio, QTStr("MacPermissions.Item.Microphone"));
-	SetStatus(ui->accessibilityPermissionButton, accessibility, QTStr("MacPermissions.Item.Accessibility"));
+	SetStatus(ui->inputMonitoringPermissionButton, inputMonitoring, QTStr("MacPermissions.Item.InputMonitoring"));
+
+	ui->accessibilityPermissionButton->setText(
+		QTStr("MacPermissions.OpenPreferences").arg(QTStr("MacPermissions.Item.Accessibility")));
+	ui->accessibilityPermissionButton->setVisible(inputMonitoring != kPermissionAuthorized);
+	ui->accessibilityPermissionLabel->setVisible(inputMonitoring != kPermissionAuthorized);
 }
 
 void OBSPermissions::SetStatus(QPushButton *btn, MacPermissionStatus status, const QString &preference)
@@ -74,10 +79,15 @@ void OBSPermissions::on_audioPermissionButton_clicked()
 	}
 }
 
+void OBSPermissions::on_inputMonitoringPermissionButton_clicked()
+{
+	OpenMacOSPrivacyPreferences("ListenEvent");
+	RequestPermission(kInputMonitoring);
+}
+
 void OBSPermissions::on_accessibilityPermissionButton_clicked()
 {
 	OpenMacOSPrivacyPreferences("Accessibility");
-	RequestPermission(kAccessibility);
 }
 
 void OBSPermissions::on_continueButton_clicked()

frontend/dialogs/OBSPermissions.hpp

@@ -40,6 +40,7 @@ private slots:
 	void on_capturePermissionButton_clicked();
 	void on_videoPermissionButton_clicked();
 	void on_audioPermissionButton_clicked();
+	void on_inputMonitoringPermissionButton_clicked();
 	void on_accessibilityPermissionButton_clicked();
 	void on_continueButton_clicked();
 };

frontend/forms/OBSPermissions.ui

@@ -344,7 +344,7 @@
               </font>
              </property>
              <property name="text">
-              <string>MacPermissions.Item.Accessibility</string>
+              <string>MacPermissions.Item.InputMonitoring</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -354,11 +354,62 @@
            <item row="6" column="1">
             <widget class="QLabel" name="label_13">
              <property name="text">
-              <string>MacPermissions.Item.Accessibility.Details</string>
+              <string>MacPermissions.Item.InputMonitoring.Details</string>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
              </property>
             </widget>
            </item>
            <item row="7" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_5">
+             <property name="sizeConstraint">
+              <enum>QLayout::SetDefaultConstraint</enum>
+             </property>
+             <item>
+              <widget class="QWidget"/>
+             </item>
+             <item>
+              <widget class="QPushButton" name="inputMonitoringPermissionButton">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>300</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>300</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="baseSize">
+                <size>
+                 <width>300</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="8" column="1">
+            <widget class="QLabel" name="accessibilityPermissionLabel">
+             <property name="text">
+              <string>MacPermissions.Item.Accessibility.Details</string>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="9" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_5">
              <property name="sizeConstraint">
               <enum>QLayout::SetDefaultConstraint</enum>

frontend/obs-main.cpp

@@ -673,14 +673,14 @@ static int run_program(fstream &logFile, int argc, char *argv[])
 #ifdef __APPLE__
 		MacPermissionStatus audio_permission = CheckPermission(kAudioDeviceAccess);
 		MacPermissionStatus video_permission = CheckPermission(kVideoDeviceAccess);
-		MacPermissionStatus accessibility_permission = CheckPermission(kAccessibility);
+		MacPermissionStatus input_monitoring_permission = CheckPermission(kInputMonitoring);
 		MacPermissionStatus screen_permission = CheckPermission(kScreenCapture);
 
 		int permissionsDialogLastShown =
 			config_get_int(App()->GetAppConfig(), "General", "MacOSPermissionsDialogLastShown");
 		if (permissionsDialogLastShown < MACOS_PERMISSIONS_DIALOG_VERSION) {
 			OBSPermissions check(nullptr, screen_permission, video_permission, audio_permission,
-					     accessibility_permission);
+					     input_monitoring_permission);
 			check.exec();
 		}
 #endif

frontend/utility/platform-osx.mm

@@ -267,16 +267,14 @@ MacPermissionStatus CheckPermissionWithPrompt(MacPermissionType type, bool promp
 
             break;
         }
-        case kAccessibility: {
-            permissionResponse = (AXIsProcessTrusted() ? kPermissionAuthorized : kPermissionDenied);
+        case kInputMonitoring: {
+            permissionResponse = (CGPreflightListenEventAccess() ? kPermissionAuthorized : kPermissionDenied);
 
             if (permissionResponse != kPermissionAuthorized && prompt_for_permission) {
-                NSDictionary *options = @{(__bridge id) kAXTrustedCheckOptionPrompt: @YES};
-                permissionResponse = (AXIsProcessTrustedWithOptions((CFDictionaryRef) options) ? kPermissionAuthorized
-                                                                                               : kPermissionDenied);
+                permissionResponse = (CGRequestListenEventAccess() ? kPermissionAuthorized : kPermissionDenied);
             }
 
-            blog(LOG_INFO, "[macOS] Permission for accessibility %s.",
+            blog(LOG_INFO, "[macOS] Permission for input monitoring %s.",
                  permissionResponse == kPermissionAuthorized ? "granted" : "denied");
             break;
         }

frontend/utility/platform.hpp

@@ -84,7 +84,7 @@ typedef enum {
 	kAudioDeviceAccess = 0,
 	kVideoDeviceAccess = 1,
 	kScreenCapture = 2,
-	kAccessibility = 3
+	kInputMonitoring = 3
 } MacPermissionType;
 
 typedef enum {

frontend/widgets/OBSBasic_MainControls.cpp

@@ -219,7 +219,7 @@ void OBSBasic::on_actionShowMacPermissions_triggered()
 {
 #ifdef __APPLE__
 	OBSPermissions check(this, CheckPermission(kScreenCapture), CheckPermission(kVideoDeviceAccess),
-			     CheckPermission(kAudioDeviceAccess), CheckPermission(kAccessibility));
+			     CheckPermission(kAudioDeviceAccess), CheckPermission(kInputMonitoring));
 	check.exec();
 #endif
 }