From af8eb56d38a2273cefb90dacb9f8f8a0ae583a3e Mon Sep 17 00:00:00 2001
From: Aylur <demstof@gmail.com>
Date: Tue, 25 Jul 2023 22:33:22 +0200
Subject: [PATCH] eventlistener widget as first arg

scroll's onChange, entry's onAccept, onChange, switch's onActivate
---
 src/utils.ts   |  4 ++--
 src/widgets.js | 31 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/utils.ts b/src/utils.ts
index 2edde83..f07462f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -141,7 +141,7 @@ export function timeout(ms: number, callback: () => void) {
     });
 }
 
-export function runCmd(cmd: string | ((args: any[]) => void), ...args: any[]) {
+export function runCmd(cmd: string | ((...args: any[]) => void), ...args: any[]) {
     if (!cmd)
         return;
 
@@ -149,7 +149,7 @@ export function runCmd(cmd: string | ((args: any[]) => void), ...args: any[]) {
         return GLib.spawn_command_line_async(cmd);
 
     if (typeof cmd === 'function')
-        return cmd(args);
+        return cmd(...args);
 }
 
 export function getConfig() {
diff --git a/src/widgets.js b/src/widgets.js
index 47b603d..2e443b6 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -3,7 +3,7 @@ import Gdk from 'gi://Gdk?version=3.0';
 import GLib from 'gi://GLib';
 import GdkPixbuf from 'gi://GdkPixbuf';
 import Widget from './widget.js';
-import { typecheck, error, runCmd, restcheck, warning, getConfig, execAsync } from './utils.js';
+import { typecheck, error, runCmd, restcheck, warning, getConfig } from './utils.js';
 
 function _orientation(str) {
     if (str === 'v')
@@ -59,12 +59,12 @@ export function EventBox({ type,
 
     const box = new Gtk.EventBox();
 
-    box.connect('enter-notify-event', () => {
+    box.connect('enter-notify-event', box => {
         box.set_state_flags(Gtk.StateFlags.PRELIGHT, false);
         runCmd(onHover, box);
     });
 
-    box.connect('leave-notify-event', () => {
+    box.connect('leave-notify-event', box => {
         box.unset_state_flags(Gtk.StateFlags.PRELIGHT);
         runCmd(onHoverLost, box);
     });
@@ -85,7 +85,7 @@ export function EventBox({ type,
 
     if (onScrollUp || onScrollDown) {
         box.add_events(Gdk.EventMask.SCROLL_MASK);
-        box.connect('scroll-event', (_w, event) => {
+        box.connect('scroll-event', (box, event) => {
             if (event.get_scroll_direction()[1] === Gdk.ScrollDirection.UP)
                 runCmd(onScrollUp, box);
             else if (event.get_scroll_direction()[1] === Gdk.ScrollDirection.DOWN)
@@ -247,8 +247,7 @@ export function Slider({ type,
     slider.connect('button-press-event', () => { slider._dragging = true; });
     slider.connect('button-release-event', () => { slider._dragging = false; });
 
-    slider.connect('scroll-event', (_w, event) => {
-        const { adjustment } = slider;
+    slider.connect('scroll-event', ({ adjustment }, event) => {
         const [, , y] = event.get_scroll_deltas();
 
         slider._dragging = true;
@@ -265,7 +264,7 @@ export function Slider({ type,
                 return;
 
             typeof onChange === 'function'
-                ? onChange(value, slider)
+                ? onChange(slider, value)
                 : runCmd(onChange.replace(/\{\}/g, value));
         });
     }
@@ -327,18 +326,18 @@ export function Entry({ type,
     });
 
     if (onAccept) {
-        entry.connect('activate', () => {
+        entry.connect('activate', ({ text }) => {
             typeof onAccept === 'function'
-                ? onAccept(entry.text, entry)
-                : runCmd(onAccept.replace(/\{\}/g, entry.text));
+                ? onAccept(entry, text)
+                : runCmd(onAccept.replace(/\{\}/g, text));
         });
     }
 
     if (onChange) {
-        entry.connect('notify::text', () => {
+        entry.connect('notify::text', ({ text }) => {
             typeof onAccept === 'function'
-                ? onChange(entry.text, entry)
-                : runCmd(onChange.replace(/\{\}/g, entry.text));
+                ? onChange(entry, text)
+                : runCmd(onChange.replace(/\{\}/g, text));
         });
     }
 
@@ -446,10 +445,10 @@ export function Switch({ type,
 
     const gtkswitch = new Gtk.Switch({ active });
     if (onActivate) {
-        gtkswitch.connect('notify::active', () => {
+        gtkswitch.connect('notify::active', ({ active }) => {
             typeof onActivate === 'function'
-                ? onActivate(gtkswitch.active, gtkswitch)
-                : runCmd(onActivate.replace(/\{\}/g, gtkswitch.activate));
+                ? onActivate(gtkswitch, active)
+                : runCmd(onActivate.replace(/\{\}/g, active));
         });
     }