fix(open-dialog): don't use xdotool on Wayland

Ref: #16

Author: ObserverOfTime

open-dialog/README.md

@@ -30,8 +30,6 @@ If you're on KDE, you should download
 If not, you should download
 [zenity.lua](zenity.lua) which uses [Zenity][zenity].
 
-[xdotool][xdotool] is required for both scripts.
-
 ### Windows
 
 Download [powershell.lua](powershell.lua).
@@ -42,4 +40,3 @@ Download [osascript.lua](osascript.lua).
 
 [kdialog]: https://github.com/KDE/kdialog
 [zenity]: https://github.com/GNOME/zenity
-[xdotool]: https://github.com/jordansissel/xdotool

open-dialog/kdialog.lua

@@ -4,6 +4,8 @@
 
 local utils = require 'mp.utils'
 
+local xorg = os.getenv('XDG_SESSION_TYPE') == 'x11'
+
 local MULTIMEDIA = table.concat({
     '*.aac',
     '*.avi',
@@ -52,20 +54,24 @@ local function KDialog(opts)
         path = path == nil and '' or utils.split_path(
             utils.join_path(utils.getcwd(), path)
         )
+        local args = {
+            'kdialog', opts.default or path,
+            '--title', opts.title,
+            '--icon', ICON,
+            '--multiple', '--separate-output',
+            opts.type or '--getopenfilename', opts.text,
+        }
         local ontop = mp.get_property_native('ontop')
-        local focus = utils.subprocess {
-            args = {'xdotool', 'getwindowfocus'}
-        }.stdout:gsub('\n$', '')
+        if xorg then
+            local focus = utils.subprocess {
+                args = {'xdotool', 'getwindowfocus'}
+            }.stdout:gsub('\n$', '')
+            table.insert(args, 5, '--attach')
+            table.insert(args, 6, focus)
+        end
         mp.set_property_native('ontop', false)
         local kdialog = utils.subprocess {
-            args = {
-                'kdialog', opts.default or path,
-                '--title', opts.title,
-                '--attach', focus,
-                '--icon', ICON,
-                '--multiple', '--separate-output',
-                opts.type or '--getopenfilename', opts.text,
-            }, cancellable = false,
+            args = args, cancellable = false
         }
         mp.set_property_native('ontop', ontop)
         if kdialog.status ~= 0 then return end

open-dialog/zenity.lua

@@ -4,6 +4,8 @@
 
 local utils = require 'mp.utils'
 
+local xorg = os.getenv('XDG_SESSION_TYPE') == 'x11'
+
 local MULTIMEDIA = table.concat({
     '*.aac',
     '*.avi',
@@ -65,23 +67,31 @@ local function Zenity(opts)
                 utils.join_path(utils.getcwd(), path)
             )
         }
-        local ontop = mp.get_property_native('ontop')
-        local focus = utils.subprocess {
-            args = {'xdotool', 'getwindowfocus'}
-        }.stdout:gsub('\n$', '')
-        mp.set_property_native('ontop', false)
-        local zenity = utils.subprocess {
-            args = merge({
+        local args = merge(
+            {
                 'zenity', '--modal',
                 '--title', opts.title,
-                '--attach', focus,
                 '--window-icon', ICON,
-            }, opts.default or path,
-            opts.text, opts.type or {
+            },
+            opts.default or path,
+            opts.text,
+            opts.type or {
                 '--file-selection',
                 '--separator', '\n',
                 '--multiple',
-            }), cancellable = false,
+            }
+        )
+        local ontop = mp.get_property_native('ontop')
+        if xorg then
+            local focus = utils.subprocess {
+                args = {'xdotool', 'getwindowfocus'}
+            }.stdout:gsub('\n$', '')
+            table.insert(args, 5, '--attach')
+            table.insert(args, 6, focus)
+        end
+        mp.set_property_native('ontop', false)
+        local zenity = utils.subprocess {
+            args = args, cancellable = false
         }
         mp.set_property_native('ontop', ontop)
         if zenity.status ~= 0 then return end