Add files via upload

Author: Cam

install.sh

@@ -37,7 +37,7 @@ fi
 
 if [ "$LOGINTYPE" = "Type=wayland" ]; then
 	while true; do
-		read -p "Naga for Wayland was installed, do you want to install for X11 too ? (recommended) y/n" yn
+		read -p "Naga for Wayland is currently installing, do you want to install for X11 too ? (recommended) y/n" yn
 		case $yn in
 		[Yy]*)
 			./src/_installX11.sh
@@ -49,7 +49,7 @@ if [ "$LOGINTYPE" = "Type=wayland" ]; then
 	done
 else
 	while true; do
-		read -p "Naga for X11 was installed, do you want to install for Wayland too ? (recommended) y/n" yn
+		read -p "Naga for X11 is currently installing, do you want to install for Wayland too ? (recommended) y/n" yn
 		case $yn in
 		[Yy]*)
 			./src/_installWayland.sh
@@ -78,10 +78,6 @@ sleep 0.5
 sudo cat /etc/sudoers | grep -qxF "$USER ALL=(ALL) NOPASSWD:/bin/systemctl start naga" || printf "\n%s ALL=(ALL) NOPASSWD:/bin/systemctl start naga\n" "$USER" | sudo EDITOR='tee -a' visudo >/dev/null
 
 
-cp -rf ./src/[email protected] ~/.local/share/gnome-shell/extensions
-gnome-extensions enable [email protected]
-
-
 sudo cp -f src/naga.service /etc/systemd/system/
 
 env | tee ~/.naga/envSetup >/dev/null

src/_installWayland.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sudo apt install -y g++ nano pkexec procps wget gnome-shell-extension-prefs dbus-x11 curl
+sudo apt install -y g++ nano pkexec procps wget gnome-shell-extension-prefs dbus-x11 curl libdbus-1-dev
 
 echo "Checking requirements..."
 
@@ -27,12 +27,17 @@ sudo mv ./src/nagaWayland /usr/local/bin/
 echo "Installing dotool :"
 
 wget https://git.sr.ht/~geb/dotool/archive/90184107489abb7a440bf1f8df9b123acc8f9628.tar.gz -O dotool.tar.gz
-tar -xf dotool.tar.gz
-cd dotool-90184107489abb7a440bf1f8df9b123acc8f9628
+tar -xf dotool.tar.gz  > /dev/null
+mv -f dotool-90184107489abb7a440bf1f8df9b123acc8f9628 dotool  > /dev/null
+cd dotool
 sudo sh install.sh > /dev/null
-cd .. > /dev/null
-rm -rdf dotool-90184107489abb7a440bf1f8df9b123acc8f9628
-rm  -f dotool.tar.gz
+cd ..
+#rm -rdf dotool
+rm  -f dotool.tar.gz  > /dev/null
+
+
+cp -rf ./src/[email protected] ~/.local/share/gnome-shell/extensions
+gnome-extensions enable [email protected]
 
 _dir="/home/$USER/.naga"
 mkdir -p "$_dir"

src/[email protected]/extension.js

@@ -29,15 +29,6 @@ const { Gio } = imports.gi;
 const MR_DBUS_IFACE = `
 <node>
     <interface name="org.gnome.Shell.Extensions.WindowsExt">
-        <method name="List">
-            <arg type="s" direction="out" name="win"/>
-        </method>
-        <method name="FocusTitle">
-            <arg type="s" direction="out" />
-        </method>
-        <method name="FocusPID">
-            <arg type="s" direction="out" />
-        </method>
         <method name="FocusClass">
             <arg type="s" direction="out" />
         </method>
@@ -55,34 +46,6 @@ class Extension {
         this._dbus.unexport();
         delete this._dbus;
     }
-    List() {
-        let win = global.get_window_actors()
-            .map(a => a.meta_window)
-            .map(w => ({ class: w.get_wm_class(), pid: w.get_pid(), id: w.get_id(), maximized: w.get_maximized(), focus: w.has_focus(), title: w.get_title() }));
-        return JSON.stringify(win);
-    }
-    FocusTitle() {
-        let win = global.get_window_actors()
-            .map(a => a.meta_window)
-            .map(w => ({ focus: w.has_focus(), title: w.get_title() }));
-        for (let [_ignore , aWindow] of win.entries()) {
-            let [focus,theTitle] = Object.entries(aWindow);
-            if (focus[1] == true )
-                return theTitle[1];
-        }
-        return "";
-    }
-    FocusPID() {
-        let win = global.get_window_actors()
-            .map(a => a.meta_window)
-            .map(w => ({ focus: w.has_focus(), pid: w.get_pid() }));
-            for (let [_ignore , aWindow] of win.entries()) {
-                let [focus,thePID] = Object.entries(aWindow);
-                if (focus[1] == true )
-                    return ""+thePID[1]; // Turn number into string
-            }
-            return "";
-        }
     FocusClass() {
         let win = global.get_window_actors()
             .map(a => a.meta_window)