check_reachable.go

@@ -21,10 +21,6 @@ func (c *Client) IsReachable() bool {
 // and returns true as soon as IsReachable returns true.
 // When ctx is closed before Hyprland is reachable, false is returned
 func (c *Client) WaitUntilReachable(ctx context.Context) bool {
-	if c.IsReachable() {
-		return true
-	}
-
 	ticker := time.NewTicker(100 * time.Millisecond)
 	defer ticker.Stop()
 

get_clients.go

@@ -1,7 +1,6 @@
 package hypr
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -69,36 +68,3 @@ func GetClients() ([]*Client, error) {
 
 	return clients, nil
 }
-
-func WaitForDefaultClient(ctx context.Context) (*Client, error) {
-	signature, ok := os.LookupEnv("HYPRLAND_INSTANCE_SIGNATURE")
-	if !ok {
-		return nil, errors.New("default instance not found because HYPRLAND_INSTANCE_SIGNATURE is not set")
-	}
-
-	return WaitForClient(ctx, signature)
-}
-
-func WaitForClient(ctx context.Context, signature string) (*Client, error) {
-	lockFilePath := fmt.Sprintf("/run/user/1000/hypr/%s/hyprland.lock", signature)
-
-	lockFileExists := waitFor(ctx, func() bool {
-		_, err := os.Stat(lockFilePath)
-		return !errors.Is(err, os.ErrNotExist)
-	})
-
-	if !lockFileExists {
-		return nil, errors.New("hyprland lock file not found")
-	}
-
-	client, err := GetClient(signature)
-	if err != nil {
-		return nil, err
-	}
-
-	if !client.WaitUntilReachable(context.Background()) {
-		return nil, errors.New("hyprland not reachable")
-	}
-
-	return client, nil
-}

model_window.go

@@ -3,39 +3,30 @@ package hypr
 import "encoding/json"
 
 type Window struct {
-	Address          string          `json:"address"`
+	Address        string         `json:"address"`
-	Mapped           bool            `json:"mapped"`
+	Mapped         bool           `json:"mapped"`
-	Hidden           bool            `json:"hidden"`
+	Hidden         bool           `json:"hidden"`
-	At               [2]int          `json:"at"`
+	At             [2]int         `json:"at"`
-	Size             [2]int          `json:"size"`
+	Size           [2]int         `json:"size"`
-	Workspace        WorkspaceIdent  `json:"workspace"`
+	Workspace      WorkspaceIdent `json:"workspace"`
-	Floating         bool            `json:"floating"`
+	Floating       bool           `json:"floating"`
-	MonitorID        int             `json:"monitor"`
+	MonitorID      int            `json:"monitor"`
-	Class            string          `json:"class"`
+	Class          string         `json:"class"`
-	Title            string          `json:"title"`
+	Title          string         `json:"title"`
-	InitialClass     string          `json:"initialClass"`
+	InitialClass   string         `json:"initialClass"`
-	InitialTitle     string          `json:"initialTitle"`
+	InitialTitle   string         `json:"initialTitle"`
-	PID              int             `json:"pid"`
+	PID            int            `json:"pid"`
-	Xwayland         bool            `json:"xwayland"`
+	Xwayland       bool           `json:"xwayland"`
-	Pinned           bool            `json:"pinned"`
+	Pinned         bool           `json:"pinned"`
-	Fullscreen       FullscreenState `json:"fullscreen"`
+	Fullscreen     bool           `json:"fullscreen"`
-	FullscreenClient FullscreenState `json:"fullscreenClient"`
+	FullscreenMode int            `json:"fullscreenMode"`
-	Grouped          []interface{}   `json:"grouped"` // TODO
+	FakeFullscreen bool           `json:"fakeFullscreen"`
-	Swallowing       string          `json:"swallowing"`
+	Grouped        []interface{}  `json:"grouped"` // TODO
-	FocusHistoryID   int             `json:"focusHistoryID"`
+	Swallowing     string         `json:"swallowing"`
+	FocusHistoryID int            `json:"focusHistoryID"`
 }
 
 func (w Window) String() string {
 	data, _ := json.MarshalIndent(w, "", "\t")
 	return string(data)
 }
-
-type FullscreenState int
-
-const (
-	FullscreenCurrent            FullscreenState = -1
-	FullscreenNone               FullscreenState = 0
-	FullscreenMaximize           FullscreenState = 1
-	FullscreenFullscreen         FullscreenState = 2
-	FullscreenMaximizeFullscreen FullscreenState = 3
-)

utils.go

@@ -1,11 +1,9 @@
 package hypr
 
 import (
-	"context"
 	"encoding/json"
 	"io"
 	"net"
-	"time"
 )
 
 func readSocketRaw(socket string, body io.Reader) (io.ReadCloser, error) {
@@ -51,23 +49,3 @@ func readSocket[T any](socket string, body io.Reader) (T, error) {
 
 	return *value, nil
 }
-
-func waitFor(ctx context.Context, condition func() bool) bool {
-	if condition() {
-		return true
-	}
-
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			if condition() {
-				return true
-			}
-		case <-ctx.Done():
-			return false
-		}
-	}
-}