i18n: add Vietnamese

- Add keyboard navigation to overview
- Add edit events to overview
- Add create events to overview
- Add setting for auto/khal/dankcalendar backend selection

.gitignore

@@ -115,3 +115,5 @@ core.*
 .direnv/
 quickshell/dms-plugins
 __pycache__
+
+.vscode/

core/cmd/dms/commands_colorpicker.go

@@ -19,7 +19,12 @@ var (
 var colorCmd = &cobra.Command{
 	Use:   "color",
 	Short: "Color utilities",
-	Long:  "Color utilities including picking colors from the screen",
+	Long: `Color utilities including picking colors from the screen.
+
+This is the screen eyedropper CLI. To open the in-shell color modal, use:
+  dms ipc call color-picker toggle
+
+See: https://danklinux.com/docs/dankmaterialshell/keybinds-ipc`,
 }
 
 var colorPickCmd = &cobra.Command{
@@ -29,6 +34,9 @@ var colorPickCmd = &cobra.Command{
 
 Click on any pixel to capture its color, or press Escape to cancel.
 
+This is the screen eyedropper CLI. To open the in-shell color modal, use:
+  dms ipc call color-picker toggle
+
 Output format flags (mutually exclusive, default: --hex):
   --hex  - Hexadecimal (#RRGGBB)
   --rgb  - RGB values (R G B)

core/cmd/dms/commands_common.go

@@ -77,10 +77,15 @@ var killCmd = &cobra.Command{
 }
 
 var ipcCmd = &cobra.Command{
-	Use:   "ipc [target] [function] [args...]",
+	Use:   "ipc",
 	Short: "Send IPC commands to running DMS shell",
+	Long: `Send IPC commands to the running DMS shell.
+
+  dms ipc call <target> <function> [args...]   invoke a command
+  dms ipc list                                 list all targets and functions
+
+Full reference: https://danklinux.com/docs/dankmaterialshell/keybinds-ipc`,
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		_ = findConfig(cmd, args)
 		return getShellIPCCompletions(args, toComplete), cobra.ShellCompDirectiveNoFileComp
 	},
 	Run: func(cmd *cobra.Command, args []string) {
@@ -88,9 +93,17 @@ var ipcCmd = &cobra.Command{
 	},
 }
 
+var ipcListCmd = &cobra.Command{
+	Use:   "list",
+	Short: "List all IPC targets and functions",
+	Run: func(cmd *cobra.Command, args []string) {
+		printIPCHelp()
+	},
+}
+
 func init() {
+	ipcCmd.AddCommand(ipcListCmd)
 	ipcCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
-		_ = findConfig(cmd, args)
 		printIPCHelp()
 	})
 }

core/cmd/dms/commands_config.go

@@ -72,7 +72,7 @@ func runResolveInclude(cmd *cobra.Command, args []string) {
 		result, err = checkHyprlandInclude(filename)
 	case "niri":
 		result, err = checkNiriInclude(filename)
-	case "mangowc", "dwl", "mango":
+	case "mangowc", "mango":
 		result, err = checkMangoWCInclude(filename)
 	default:
 		log.Fatalf("Unknown compositor: %s", compositor)

core/cmd/dms/commands_screenshot.go

@@ -39,7 +39,7 @@ Modes:
   full        - Capture the focused output
   all         - Capture all outputs combined
   output      - Capture a specific output by name
-  window      - Capture the focused window (Hyprland/DWL)
+  window      - Capture the focused window (Hyprland/Mango)
   last        - Capture the last selected region
 
 Output format (--format):
@@ -97,7 +97,7 @@ If no previous region exists, falls back to interactive selection.`,
 var ssWindowCmd = &cobra.Command{
 	Use:   "window",
 	Short: "Capture the focused window",
-	Long:  `Capture the currently focused window. Supported on Hyprland and DWL.`,
+	Long:  `Capture the currently focused window. Supported on Hyprland and Mango.`,
 	Run:   runScreenshotWindow,
 }
 

core/cmd/dms/shell.go

@@ -601,12 +601,30 @@ func parseTargetsFromIPCShowOutput(output string) ipcTargets {
 	return targets
 }
 
-func getShellIPCCompletions(args []string, _ string) []string {
+func buildQsIPCBaseArgs() ([]string, error) {
 	cmdArgs := []string{"ipc"}
-	if qsHasAnyDisplay() {
-		cmdArgs = append(cmdArgs, "--any-display")
+	switch pid, ok := getFirstDMSPID(); {
+	case ok:
+		cmdArgs = append(cmdArgs, "--pid", strconv.Itoa(pid))
+	default:
+		if err := findConfig(nil, nil); err != nil {
+			return nil, err
+		}
+		if qsHasAnyDisplay() {
+			cmdArgs = append(cmdArgs, "--any-display")
+		}
+		cmdArgs = append(cmdArgs, "-p", configPath)
 	}
-	cmdArgs = append(cmdArgs, "-p", configPath, "show")
+	return cmdArgs, nil
+}
+
+func getShellIPCCompletions(args []string, _ string) []string {
+	baseArgs, err := buildQsIPCBaseArgs()
+	if err != nil {
+		log.Debugf("Error building IPC args for completions: %v", err)
+		return nil
+	}
+	cmdArgs := append(baseArgs, "show")
 	cmd := exec.Command("qs", cmdArgs...)
 	var targets ipcTargets
 
@@ -623,7 +641,7 @@ func getShellIPCCompletions(args []string, _ string) []string {
 
 	if len(args) == 0 {
 		targetNames := make([]string, 0)
-		targetNames = append(targetNames, "call")
+		targetNames = append(targetNames, "call", "list")
 		for k := range targets {
 			targetNames = append(targetNames, k)
 		}
@@ -696,23 +714,11 @@ func runShellIPCCommand(args []string) {
 		args = append([]string{"call"}, args...)
 	}
 
-	cmdArgs := []string{"ipc"}
-
-	switch pid, ok := getFirstDMSPID(); {
-	case ok:
-		cmdArgs = append(cmdArgs, "--pid", strconv.Itoa(pid))
-	default:
-		if err := findConfig(nil, nil); err != nil {
-			log.Fatalf("Error finding config: %v", err)
-		}
-		// ! TODO - remove check when QS 0.3 is released
-		if qsHasAnyDisplay() {
-			cmdArgs = append(cmdArgs, "--any-display")
-		}
-		cmdArgs = append(cmdArgs, "-p", configPath)
+	baseArgs, err := buildQsIPCBaseArgs()
+	if err != nil {
+		log.Fatalf("Error finding config: %v", err)
 	}
-
-	cmdArgs = append(cmdArgs, args...)
+	cmdArgs := append(baseArgs, args...)
 	cmd := exec.Command("qs", cmdArgs...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
@@ -724,19 +730,20 @@ func runShellIPCCommand(args []string) {
 }
 
 func printIPCHelp() {
-	fmt.Println("Usage: dms ipc <target> <function> [args...]")
+	fmt.Println("Usage: dms ipc call <target> <function> [args...]")
 	fmt.Println()
 
-	cmdArgs := []string{"ipc"}
-	if qsHasAnyDisplay() {
-		cmdArgs = append(cmdArgs, "--any-display")
+	baseArgs, err := buildQsIPCBaseArgs()
+	if err != nil {
+		printIPCHelpFailure(err)
+		return
 	}
-	cmdArgs = append(cmdArgs, "-p", configPath, "show")
+	cmdArgs := append(baseArgs, "show")
 	cmd := exec.Command("qs", cmdArgs...)
 
 	output, err := cmd.Output()
 	if err != nil {
-		fmt.Println("Could not retrieve available IPC targets (is DMS running?)")
+		printIPCHelpFailure(err)
 		return
 	}
 
@@ -765,6 +772,16 @@ func printIPCHelp() {
 	}
 }
 
+func printIPCHelpFailure(err error) {
+	fmt.Println("Could not retrieve IPC targets.")
+	if err != nil {
+		fmt.Printf("  %v\n", err)
+	}
+	fmt.Println()
+	fmt.Println("  Full docs:  https://danklinux.com/docs/dankmaterialshell/keybinds-ipc")
+	fmt.Println("  Try:        dms ipc call <target> <function>")
+}
+
 // ensureFontCache rebuilds the fontconfig cache if user-configured fonts are missing while skipping defaults
 func ensureFontCache() {
 	if _, err := exec.LookPath("fc-list"); err != nil {

core/internal/proto/dwl_ipc/dwl_ipc.go

@@ -1,791 +0,0 @@
-// Generated by go-wayland-scanner
-// https://github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/cmd/go-wayland-scanner
-// XML file : internal/proto/xml/dwl-ipc-unstable-v2.xml
-//
-// dwl_ipc_unstable_v2 Protocol Copyright:
-
-package dwl_ipc
-
-import "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-
-// ZdwlIpcManagerV2InterfaceName is the name of the interface as it appears in the [client.Registry].
-// It can be used to match the [client.RegistryGlobalEvent.Interface] in the
-// [Registry.SetGlobalHandler] and can be used in [Registry.Bind] if this applies.
-const ZdwlIpcManagerV2InterfaceName = "zdwl_ipc_manager_v2"
-
-// ZdwlIpcManagerV2 : manage dwl state
-//
-// This interface is exposed as a global in wl_registry.
-//
-// Clients can use this interface to get a dwl_ipc_output.
-// After binding the client will recieve the dwl_ipc_manager.tags and dwl_ipc_manager.layout events.
-// The dwl_ipc_manager.tags and dwl_ipc_manager.layout events expose tags and layouts to the client.
-type ZdwlIpcManagerV2 struct {
-	client.BaseProxy
-	tagsHandler   ZdwlIpcManagerV2TagsHandlerFunc
-	layoutHandler ZdwlIpcManagerV2LayoutHandlerFunc
-}
-
-// NewZdwlIpcManagerV2 : manage dwl state
-//
-// This interface is exposed as a global in wl_registry.
-//
-// Clients can use this interface to get a dwl_ipc_output.
-// After binding the client will recieve the dwl_ipc_manager.tags and dwl_ipc_manager.layout events.
-// The dwl_ipc_manager.tags and dwl_ipc_manager.layout events expose tags and layouts to the client.
-func NewZdwlIpcManagerV2(ctx *client.Context) *ZdwlIpcManagerV2 {
-	zdwlIpcManagerV2 := &ZdwlIpcManagerV2{}
-	ctx.Register(zdwlIpcManagerV2)
-	return zdwlIpcManagerV2
-}
-
-// Release : release dwl_ipc_manager
-//
-// Indicates that the client will not the dwl_ipc_manager object anymore.
-// Objects created through this instance are not affected.
-func (i *ZdwlIpcManagerV2) Release() error {
-	defer i.MarkZombie()
-	const opcode = 0
-	const _reqBufLen = 8
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// GetOutput : get a dwl_ipc_outout for a wl_output
-//
-// Get a dwl_ipc_outout for the specified wl_output.
-func (i *ZdwlIpcManagerV2) GetOutput(output *client.Output) (*ZdwlIpcOutputV2, error) {
-	id := NewZdwlIpcOutputV2(i.Context())
-	const opcode = 1
-	const _reqBufLen = 8 + 4 + 4
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], id.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], output.ID())
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return id, err
-}
-
-// ZdwlIpcManagerV2TagsEvent : Announces tag amount
-//
-// This event is sent after binding.
-// A roundtrip after binding guarantees the client recieved all tags.
-type ZdwlIpcManagerV2TagsEvent struct {
-	Amount uint32
-}
-type ZdwlIpcManagerV2TagsHandlerFunc func(ZdwlIpcManagerV2TagsEvent)
-
-// SetTagsHandler : sets handler for ZdwlIpcManagerV2TagsEvent
-func (i *ZdwlIpcManagerV2) SetTagsHandler(f ZdwlIpcManagerV2TagsHandlerFunc) {
-	i.tagsHandler = f
-}
-
-// ZdwlIpcManagerV2LayoutEvent : Announces a layout
-//
-// This event is sent after binding.
-// A roundtrip after binding guarantees the client recieved all layouts.
-type ZdwlIpcManagerV2LayoutEvent struct {
-	Name string
-}
-type ZdwlIpcManagerV2LayoutHandlerFunc func(ZdwlIpcManagerV2LayoutEvent)
-
-// SetLayoutHandler : sets handler for ZdwlIpcManagerV2LayoutEvent
-func (i *ZdwlIpcManagerV2) SetLayoutHandler(f ZdwlIpcManagerV2LayoutHandlerFunc) {
-	i.layoutHandler = f
-}
-
-func (i *ZdwlIpcManagerV2) Dispatch(opcode uint32, fd int, data []byte) {
-	switch opcode {
-	case 0:
-		if i.tagsHandler == nil {
-			return
-		}
-		var e ZdwlIpcManagerV2TagsEvent
-		l := 0
-		e.Amount = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.tagsHandler(e)
-	case 1:
-		if i.layoutHandler == nil {
-			return
-		}
-		var e ZdwlIpcManagerV2LayoutEvent
-		l := 0
-		nameLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.Name = client.String(data[l : l+nameLen])
-		l += nameLen
-
-		i.layoutHandler(e)
-	}
-}
-
-// ZdwlIpcOutputV2InterfaceName is the name of the interface as it appears in the [client.Registry].
-// It can be used to match the [client.RegistryGlobalEvent.Interface] in the
-// [Registry.SetGlobalHandler] and can be used in [Registry.Bind] if this applies.
-const ZdwlIpcOutputV2InterfaceName = "zdwl_ipc_output_v2"
-
-// ZdwlIpcOutputV2 : control dwl output
-//
-// Observe and control a dwl output.
-//
-// Events are double-buffered:
-// Clients should cache events and redraw when a dwl_ipc_output.frame event is sent.
-//
-// Request are not double-buffered:
-// The compositor will update immediately upon request.
-type ZdwlIpcOutputV2 struct {
-	client.BaseProxy
-	toggleVisibilityHandler ZdwlIpcOutputV2ToggleVisibilityHandlerFunc
-	activeHandler           ZdwlIpcOutputV2ActiveHandlerFunc
-	tagHandler              ZdwlIpcOutputV2TagHandlerFunc
-	layoutHandler           ZdwlIpcOutputV2LayoutHandlerFunc
-	titleHandler            ZdwlIpcOutputV2TitleHandlerFunc
-	appidHandler            ZdwlIpcOutputV2AppidHandlerFunc
-	layoutSymbolHandler     ZdwlIpcOutputV2LayoutSymbolHandlerFunc
-	frameHandler            ZdwlIpcOutputV2FrameHandlerFunc
-	fullscreenHandler       ZdwlIpcOutputV2FullscreenHandlerFunc
-	floatingHandler         ZdwlIpcOutputV2FloatingHandlerFunc
-	xHandler                ZdwlIpcOutputV2XHandlerFunc
-	yHandler                ZdwlIpcOutputV2YHandlerFunc
-	widthHandler            ZdwlIpcOutputV2WidthHandlerFunc
-	heightHandler           ZdwlIpcOutputV2HeightHandlerFunc
-	lastLayerHandler        ZdwlIpcOutputV2LastLayerHandlerFunc
-	kbLayoutHandler         ZdwlIpcOutputV2KbLayoutHandlerFunc
-	keymodeHandler          ZdwlIpcOutputV2KeymodeHandlerFunc
-	scalefactorHandler      ZdwlIpcOutputV2ScalefactorHandlerFunc
-}
-
-// NewZdwlIpcOutputV2 : control dwl output
-//
-// Observe and control a dwl output.
-//
-// Events are double-buffered:
-// Clients should cache events and redraw when a dwl_ipc_output.frame event is sent.
-//
-// Request are not double-buffered:
-// The compositor will update immediately upon request.
-func NewZdwlIpcOutputV2(ctx *client.Context) *ZdwlIpcOutputV2 {
-	zdwlIpcOutputV2 := &ZdwlIpcOutputV2{}
-	ctx.Register(zdwlIpcOutputV2)
-	return zdwlIpcOutputV2
-}
-
-// Release : release dwl_ipc_outout
-//
-// Indicates to that the client no longer needs this dwl_ipc_output.
-func (i *ZdwlIpcOutputV2) Release() error {
-	defer i.MarkZombie()
-	const opcode = 0
-	const _reqBufLen = 8
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// SetTags : Set the active tags of this output
-//
-//	tagmask: bitmask of the tags that should be set.
-//	toggleTagset: toggle the selected tagset, zero for invalid, nonzero for valid.
-func (i *ZdwlIpcOutputV2) SetTags(tagmask, toggleTagset uint32) error {
-	const opcode = 1
-	const _reqBufLen = 8 + 4 + 4
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(tagmask))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(toggleTagset))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// SetClientTags : Set the tags of the focused client.
-//
-// The tags are updated as follows:
-// new_tags = (current_tags AND and_tags) XOR xor_tags
-func (i *ZdwlIpcOutputV2) SetClientTags(andTags, xorTags uint32) error {
-	const opcode = 2
-	const _reqBufLen = 8 + 4 + 4
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(andTags))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(xorTags))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// SetLayout : Set the layout of this output
-//
-//	index: index of a layout recieved by dwl_ipc_manager.layout
-func (i *ZdwlIpcOutputV2) SetLayout(index uint32) error {
-	const opcode = 3
-	const _reqBufLen = 8 + 4
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(index))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// Quit : Quit mango
-// This request allows clients to instruct the compositor to quit mango.
-func (i *ZdwlIpcOutputV2) Quit() error {
-	const opcode = 4
-	const _reqBufLen = 8
-	var _reqBuf [_reqBufLen]byte
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	err := i.Context().WriteMsg(_reqBuf[:], nil)
-	return err
-}
-
-// SendDispatch : Set the active tags of this output
-//
-//	dispatch: dispatch name.
-//	arg1: arg1.
-//	arg2: arg2.
-//	arg3: arg3.
-//	arg4: arg4.
-//	arg5: arg5.
-func (i *ZdwlIpcOutputV2) SendDispatch(dispatch, arg1, arg2, arg3, arg4, arg5 string) error {
-	const opcode = 5
-	dispatchLen := client.PaddedLen(len(dispatch) + 1)
-	arg1Len := client.PaddedLen(len(arg1) + 1)
-	arg2Len := client.PaddedLen(len(arg2) + 1)
-	arg3Len := client.PaddedLen(len(arg3) + 1)
-	arg4Len := client.PaddedLen(len(arg4) + 1)
-	arg5Len := client.PaddedLen(len(arg5) + 1)
-	_reqBufLen := 8 + (4 + dispatchLen) + (4 + arg1Len) + (4 + arg2Len) + (4 + arg3Len) + (4 + arg4Len) + (4 + arg5Len)
-	_reqBuf := make([]byte, _reqBufLen)
-	l := 0
-	client.PutUint32(_reqBuf[l:4], i.ID())
-	l += 4
-	client.PutUint32(_reqBuf[l:l+4], uint32(_reqBufLen<<16|opcode&0x0000ffff))
-	l += 4
-	client.PutString(_reqBuf[l:l+(4+dispatchLen)], dispatch)
-	l += (4 + dispatchLen)
-	client.PutString(_reqBuf[l:l+(4+arg1Len)], arg1)
-	l += (4 + arg1Len)
-	client.PutString(_reqBuf[l:l+(4+arg2Len)], arg2)
-	l += (4 + arg2Len)
-	client.PutString(_reqBuf[l:l+(4+arg3Len)], arg3)
-	l += (4 + arg3Len)
-	client.PutString(_reqBuf[l:l+(4+arg4Len)], arg4)
-	l += (4 + arg4Len)
-	client.PutString(_reqBuf[l:l+(4+arg5Len)], arg5)
-	l += (4 + arg5Len)
-	err := i.Context().WriteMsg(_reqBuf, nil)
-	return err
-}
-
-type ZdwlIpcOutputV2TagState uint32
-
-// ZdwlIpcOutputV2TagState :
-const (
-	// ZdwlIpcOutputV2TagStateNone : no state
-	ZdwlIpcOutputV2TagStateNone ZdwlIpcOutputV2TagState = 0
-	// ZdwlIpcOutputV2TagStateActive : tag is active
-	ZdwlIpcOutputV2TagStateActive ZdwlIpcOutputV2TagState = 1
-	// ZdwlIpcOutputV2TagStateUrgent : tag has at least one urgent client
-	ZdwlIpcOutputV2TagStateUrgent ZdwlIpcOutputV2TagState = 2
-)
-
-func (e ZdwlIpcOutputV2TagState) Name() string {
-	switch e {
-	case ZdwlIpcOutputV2TagStateNone:
-		return "none"
-	case ZdwlIpcOutputV2TagStateActive:
-		return "active"
-	case ZdwlIpcOutputV2TagStateUrgent:
-		return "urgent"
-	default:
-		return ""
-	}
-}
-
-func (e ZdwlIpcOutputV2TagState) Value() string {
-	switch e {
-	case ZdwlIpcOutputV2TagStateNone:
-		return "0"
-	case ZdwlIpcOutputV2TagStateActive:
-		return "1"
-	case ZdwlIpcOutputV2TagStateUrgent:
-		return "2"
-	default:
-		return ""
-	}
-}
-
-func (e ZdwlIpcOutputV2TagState) String() string {
-	return e.Name() + "=" + e.Value()
-}
-
-// ZdwlIpcOutputV2ToggleVisibilityEvent : Toggle client visibilty
-//
-// Indicates the client should hide or show themselves.
-// If the client is visible then hide, if hidden then show.
-type ZdwlIpcOutputV2ToggleVisibilityEvent struct{}
-type ZdwlIpcOutputV2ToggleVisibilityHandlerFunc func(ZdwlIpcOutputV2ToggleVisibilityEvent)
-
-// SetToggleVisibilityHandler : sets handler for ZdwlIpcOutputV2ToggleVisibilityEvent
-func (i *ZdwlIpcOutputV2) SetToggleVisibilityHandler(f ZdwlIpcOutputV2ToggleVisibilityHandlerFunc) {
-	i.toggleVisibilityHandler = f
-}
-
-// ZdwlIpcOutputV2ActiveEvent : Update the selected output.
-//
-// Indicates if the output is active. Zero is invalid, nonzero is valid.
-type ZdwlIpcOutputV2ActiveEvent struct {
-	Active uint32
-}
-type ZdwlIpcOutputV2ActiveHandlerFunc func(ZdwlIpcOutputV2ActiveEvent)
-
-// SetActiveHandler : sets handler for ZdwlIpcOutputV2ActiveEvent
-func (i *ZdwlIpcOutputV2) SetActiveHandler(f ZdwlIpcOutputV2ActiveHandlerFunc) {
-	i.activeHandler = f
-}
-
-// ZdwlIpcOutputV2TagEvent : Update the state of a tag.
-//
-// Indicates that a tag has been updated.
-type ZdwlIpcOutputV2TagEvent struct {
-	Tag     uint32
-	State   uint32
-	Clients uint32
-	Focused uint32
-}
-type ZdwlIpcOutputV2TagHandlerFunc func(ZdwlIpcOutputV2TagEvent)
-
-// SetTagHandler : sets handler for ZdwlIpcOutputV2TagEvent
-func (i *ZdwlIpcOutputV2) SetTagHandler(f ZdwlIpcOutputV2TagHandlerFunc) {
-	i.tagHandler = f
-}
-
-// ZdwlIpcOutputV2LayoutEvent : Update the layout.
-//
-// Indicates a new layout is selected.
-type ZdwlIpcOutputV2LayoutEvent struct {
-	Layout uint32
-}
-type ZdwlIpcOutputV2LayoutHandlerFunc func(ZdwlIpcOutputV2LayoutEvent)
-
-// SetLayoutHandler : sets handler for ZdwlIpcOutputV2LayoutEvent
-func (i *ZdwlIpcOutputV2) SetLayoutHandler(f ZdwlIpcOutputV2LayoutHandlerFunc) {
-	i.layoutHandler = f
-}
-
-// ZdwlIpcOutputV2TitleEvent : Update the title.
-//
-// Indicates the title has changed.
-type ZdwlIpcOutputV2TitleEvent struct {
-	Title string
-}
-type ZdwlIpcOutputV2TitleHandlerFunc func(ZdwlIpcOutputV2TitleEvent)
-
-// SetTitleHandler : sets handler for ZdwlIpcOutputV2TitleEvent
-func (i *ZdwlIpcOutputV2) SetTitleHandler(f ZdwlIpcOutputV2TitleHandlerFunc) {
-	i.titleHandler = f
-}
-
-// ZdwlIpcOutputV2AppidEvent : Update the appid.
-//
-// Indicates the appid has changed.
-type ZdwlIpcOutputV2AppidEvent struct {
-	Appid string
-}
-type ZdwlIpcOutputV2AppidHandlerFunc func(ZdwlIpcOutputV2AppidEvent)
-
-// SetAppidHandler : sets handler for ZdwlIpcOutputV2AppidEvent
-func (i *ZdwlIpcOutputV2) SetAppidHandler(f ZdwlIpcOutputV2AppidHandlerFunc) {
-	i.appidHandler = f
-}
-
-// ZdwlIpcOutputV2LayoutSymbolEvent : Update the current layout symbol
-//
-// Indicates the layout has changed. Since layout symbols are dynamic.
-// As opposed to the zdwl_ipc_manager.layout event, this should take precendence when displaying.
-// You can ignore the zdwl_ipc_output.layout event.
-type ZdwlIpcOutputV2LayoutSymbolEvent struct {
-	Layout string
-}
-type ZdwlIpcOutputV2LayoutSymbolHandlerFunc func(ZdwlIpcOutputV2LayoutSymbolEvent)
-
-// SetLayoutSymbolHandler : sets handler for ZdwlIpcOutputV2LayoutSymbolEvent
-func (i *ZdwlIpcOutputV2) SetLayoutSymbolHandler(f ZdwlIpcOutputV2LayoutSymbolHandlerFunc) {
-	i.layoutSymbolHandler = f
-}
-
-// ZdwlIpcOutputV2FrameEvent : The update sequence is done.
-//
-// Indicates that a sequence of status updates have finished and the client should redraw.
-type ZdwlIpcOutputV2FrameEvent struct{}
-type ZdwlIpcOutputV2FrameHandlerFunc func(ZdwlIpcOutputV2FrameEvent)
-
-// SetFrameHandler : sets handler for ZdwlIpcOutputV2FrameEvent
-func (i *ZdwlIpcOutputV2) SetFrameHandler(f ZdwlIpcOutputV2FrameHandlerFunc) {
-	i.frameHandler = f
-}
-
-// ZdwlIpcOutputV2FullscreenEvent : Update fullscreen status
-//
-// Indicates if the selected client on this output is fullscreen.
-type ZdwlIpcOutputV2FullscreenEvent struct {
-	IsFullscreen uint32
-}
-type ZdwlIpcOutputV2FullscreenHandlerFunc func(ZdwlIpcOutputV2FullscreenEvent)
-
-// SetFullscreenHandler : sets handler for ZdwlIpcOutputV2FullscreenEvent
-func (i *ZdwlIpcOutputV2) SetFullscreenHandler(f ZdwlIpcOutputV2FullscreenHandlerFunc) {
-	i.fullscreenHandler = f
-}
-
-// ZdwlIpcOutputV2FloatingEvent : Update the floating status
-//
-// Indicates if the selected client on this output is floating.
-type ZdwlIpcOutputV2FloatingEvent struct {
-	IsFloating uint32
-}
-type ZdwlIpcOutputV2FloatingHandlerFunc func(ZdwlIpcOutputV2FloatingEvent)
-
-// SetFloatingHandler : sets handler for ZdwlIpcOutputV2FloatingEvent
-func (i *ZdwlIpcOutputV2) SetFloatingHandler(f ZdwlIpcOutputV2FloatingHandlerFunc) {
-	i.floatingHandler = f
-}
-
-// ZdwlIpcOutputV2XEvent : Update the x coordinates
-//
-// Indicates if x coordinates of the selected client.
-type ZdwlIpcOutputV2XEvent struct {
-	X int32
-}
-type ZdwlIpcOutputV2XHandlerFunc func(ZdwlIpcOutputV2XEvent)
-
-// SetXHandler : sets handler for ZdwlIpcOutputV2XEvent
-func (i *ZdwlIpcOutputV2) SetXHandler(f ZdwlIpcOutputV2XHandlerFunc) {
-	i.xHandler = f
-}
-
-// ZdwlIpcOutputV2YEvent : Update the y coordinates
-//
-// Indicates if y coordinates of the selected client.
-type ZdwlIpcOutputV2YEvent struct {
-	Y int32
-}
-type ZdwlIpcOutputV2YHandlerFunc func(ZdwlIpcOutputV2YEvent)
-
-// SetYHandler : sets handler for ZdwlIpcOutputV2YEvent
-func (i *ZdwlIpcOutputV2) SetYHandler(f ZdwlIpcOutputV2YHandlerFunc) {
-	i.yHandler = f
-}
-
-// ZdwlIpcOutputV2WidthEvent : Update the width
-//
-// Indicates if width of the selected client.
-type ZdwlIpcOutputV2WidthEvent struct {
-	Width int32
-}
-type ZdwlIpcOutputV2WidthHandlerFunc func(ZdwlIpcOutputV2WidthEvent)
-
-// SetWidthHandler : sets handler for ZdwlIpcOutputV2WidthEvent
-func (i *ZdwlIpcOutputV2) SetWidthHandler(f ZdwlIpcOutputV2WidthHandlerFunc) {
-	i.widthHandler = f
-}
-
-// ZdwlIpcOutputV2HeightEvent : Update the height
-//
-// Indicates if height of the selected client.
-type ZdwlIpcOutputV2HeightEvent struct {
-	Height int32
-}
-type ZdwlIpcOutputV2HeightHandlerFunc func(ZdwlIpcOutputV2HeightEvent)
-
-// SetHeightHandler : sets handler for ZdwlIpcOutputV2HeightEvent
-func (i *ZdwlIpcOutputV2) SetHeightHandler(f ZdwlIpcOutputV2HeightHandlerFunc) {
-	i.heightHandler = f
-}
-
-// ZdwlIpcOutputV2LastLayerEvent : last map layer.
-//
-// last map layer.
-type ZdwlIpcOutputV2LastLayerEvent struct {
-	LastLayer string
-}
-type ZdwlIpcOutputV2LastLayerHandlerFunc func(ZdwlIpcOutputV2LastLayerEvent)
-
-// SetLastLayerHandler : sets handler for ZdwlIpcOutputV2LastLayerEvent
-func (i *ZdwlIpcOutputV2) SetLastLayerHandler(f ZdwlIpcOutputV2LastLayerHandlerFunc) {
-	i.lastLayerHandler = f
-}
-
-// ZdwlIpcOutputV2KbLayoutEvent : current keyboard layout.
-//
-// current keyboard layout.
-type ZdwlIpcOutputV2KbLayoutEvent struct {
-	KbLayout string
-}
-type ZdwlIpcOutputV2KbLayoutHandlerFunc func(ZdwlIpcOutputV2KbLayoutEvent)
-
-// SetKbLayoutHandler : sets handler for ZdwlIpcOutputV2KbLayoutEvent
-func (i *ZdwlIpcOutputV2) SetKbLayoutHandler(f ZdwlIpcOutputV2KbLayoutHandlerFunc) {
-	i.kbLayoutHandler = f
-}
-
-// ZdwlIpcOutputV2KeymodeEvent : current keybind mode.
-//
-// current keybind mode.
-type ZdwlIpcOutputV2KeymodeEvent struct {
-	Keymode string
-}
-type ZdwlIpcOutputV2KeymodeHandlerFunc func(ZdwlIpcOutputV2KeymodeEvent)
-
-// SetKeymodeHandler : sets handler for ZdwlIpcOutputV2KeymodeEvent
-func (i *ZdwlIpcOutputV2) SetKeymodeHandler(f ZdwlIpcOutputV2KeymodeHandlerFunc) {
-	i.keymodeHandler = f
-}
-
-// ZdwlIpcOutputV2ScalefactorEvent : scale factor of monitor.
-//
-// scale factor of monitor.
-type ZdwlIpcOutputV2ScalefactorEvent struct {
-	Scalefactor uint32
-}
-type ZdwlIpcOutputV2ScalefactorHandlerFunc func(ZdwlIpcOutputV2ScalefactorEvent)
-
-// SetScalefactorHandler : sets handler for ZdwlIpcOutputV2ScalefactorEvent
-func (i *ZdwlIpcOutputV2) SetScalefactorHandler(f ZdwlIpcOutputV2ScalefactorHandlerFunc) {
-	i.scalefactorHandler = f
-}
-
-func (i *ZdwlIpcOutputV2) Dispatch(opcode uint32, fd int, data []byte) {
-	switch opcode {
-	case 0:
-		if i.toggleVisibilityHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2ToggleVisibilityEvent
-
-		i.toggleVisibilityHandler(e)
-	case 1:
-		if i.activeHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2ActiveEvent
-		l := 0
-		e.Active = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.activeHandler(e)
-	case 2:
-		if i.tagHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2TagEvent
-		l := 0
-		e.Tag = client.Uint32(data[l : l+4])
-		l += 4
-		e.State = client.Uint32(data[l : l+4])
-		l += 4
-		e.Clients = client.Uint32(data[l : l+4])
-		l += 4
-		e.Focused = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.tagHandler(e)
-	case 3:
-		if i.layoutHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2LayoutEvent
-		l := 0
-		e.Layout = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.layoutHandler(e)
-	case 4:
-		if i.titleHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2TitleEvent
-		l := 0
-		titleLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.Title = client.String(data[l : l+titleLen])
-		l += titleLen
-
-		i.titleHandler(e)
-	case 5:
-		if i.appidHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2AppidEvent
-		l := 0
-		appidLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.Appid = client.String(data[l : l+appidLen])
-		l += appidLen
-
-		i.appidHandler(e)
-	case 6:
-		if i.layoutSymbolHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2LayoutSymbolEvent
-		l := 0
-		layoutLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.Layout = client.String(data[l : l+layoutLen])
-		l += layoutLen
-
-		i.layoutSymbolHandler(e)
-	case 7:
-		if i.frameHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2FrameEvent
-
-		i.frameHandler(e)
-	case 8:
-		if i.fullscreenHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2FullscreenEvent
-		l := 0
-		e.IsFullscreen = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.fullscreenHandler(e)
-	case 9:
-		if i.floatingHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2FloatingEvent
-		l := 0
-		e.IsFloating = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.floatingHandler(e)
-	case 10:
-		if i.xHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2XEvent
-		l := 0
-		e.X = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.xHandler(e)
-	case 11:
-		if i.yHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2YEvent
-		l := 0
-		e.Y = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.yHandler(e)
-	case 12:
-		if i.widthHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2WidthEvent
-		l := 0
-		e.Width = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.widthHandler(e)
-	case 13:
-		if i.heightHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2HeightEvent
-		l := 0
-		e.Height = int32(client.Uint32(data[l : l+4]))
-		l += 4
-
-		i.heightHandler(e)
-	case 14:
-		if i.lastLayerHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2LastLayerEvent
-		l := 0
-		lastLayerLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.LastLayer = client.String(data[l : l+lastLayerLen])
-		l += lastLayerLen
-
-		i.lastLayerHandler(e)
-	case 15:
-		if i.kbLayoutHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2KbLayoutEvent
-		l := 0
-		kbLayoutLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.KbLayout = client.String(data[l : l+kbLayoutLen])
-		l += kbLayoutLen
-
-		i.kbLayoutHandler(e)
-	case 16:
-		if i.keymodeHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2KeymodeEvent
-		l := 0
-		keymodeLen := client.PaddedLen(int(client.Uint32(data[l : l+4])))
-		l += 4
-		e.Keymode = client.String(data[l : l+keymodeLen])
-		l += keymodeLen
-
-		i.keymodeHandler(e)
-	case 17:
-		if i.scalefactorHandler == nil {
-			return
-		}
-		var e ZdwlIpcOutputV2ScalefactorEvent
-		l := 0
-		e.Scalefactor = client.Uint32(data[l : l+4])
-		l += 4
-
-		i.scalefactorHandler(e)
-	}
-}

core/internal/qmlchecks/lockscreen_input_test.go

@@ -0,0 +1,25 @@
+package qmlchecks
+
+import (
+	"os"
+	"regexp"
+	"strings"
+	"testing"
+)
+
+func TestLockScreenPasswordFieldBypassesTextInputIME(t *testing.T) {
+	data, err := os.ReadFile("../../../quickshell/Modules/Lock/LockScreenContent.qml")
+	if err != nil {
+		t.Fatalf("read lock screen QML: %v", err)
+	}
+
+	content := string(data)
+	textInputPasswordField := regexp.MustCompile(`(?s)TextInput\s*\{[^{}]*id:\s*passwordField`)
+	if textInputPasswordField.MatchString(content) {
+		t.Fatalf("passwordField must not be a TextInput because TextInput can route physical keyboard input through IME")
+	}
+
+	if !strings.Contains(content, "Keys.onPressed") || !strings.Contains(content, "event.text") {
+		t.Fatalf("passwordField should handle physical key text manually instead of relying on a text input control")
+	}
+}

core/internal/screenshot/compositor.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/dwl_ipc"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management"
 	wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client"
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
@@ -19,9 +18,9 @@ const (
 	CompositorHyprland
 	CompositorSway
 	CompositorNiri
-	CompositorDWL
 	CompositorScroll
 	CompositorMiracle
+	CompositorMango
 )
 
 var detectedCompositor Compositor = -1
@@ -36,8 +35,14 @@ func DetectCompositor() Compositor {
 	swaySocket := os.Getenv("SWAYSOCK")
 	scrollSocket := os.Getenv("SCROLLSOCK")
 	miracleSocket := os.Getenv("MIRACLESOCK")
+	mangoSocket := os.Getenv("MANGO_INSTANCE_SIGNATURE")
 
 	switch {
+	case mangoSocket != "":
+		if _, err := os.Stat(mangoSocket); err == nil {
+			detectedCompositor = CompositorMango
+			return detectedCompositor
+		}
 	case niriSocket != "":
 		if _, err := os.Stat(niriSocket); err == nil {
 			detectedCompositor = CompositorNiri
@@ -63,66 +68,29 @@ func DetectCompositor() Compositor {
 		return detectedCompositor
 	}
 
-	if detectDWLProtocol() {
-		detectedCompositor = CompositorDWL
-		return detectedCompositor
-	}
-
 	detectedCompositor = CompositorUnknown
 	return detectedCompositor
 }
 
-func detectDWLProtocol() bool {
-	display, err := client.Connect("")
-	if err != nil {
-		return false
-	}
-	ctx := display.Context()
-	defer ctx.Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return false
-	}
-
-	found := false
-	registry.SetGlobalHandler(func(e client.RegistryGlobalEvent) {
-		if e.Interface == dwl_ipc.ZdwlIpcManagerV2InterfaceName {
-			found = true
-		}
-	})
-
-	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return false
-	}
-
-	return found
-}
-
-func SetCompositorDWL() {
-	detectedCompositor = CompositorDWL
-}
-
 type WindowGeometry struct {
-	X               int32
-	Y               int32
-	Width           int32
-	Height          int32
-	Output          string
-	Scale           float64
-	OutputX         int32
-	OutputY         int32
-	OutputTransform int32
+	X       int32
+	Y       int32
+	Width   int32
+	Height  int32
+	Output  string
+	Scale   float64
+	OutputX int32
+	OutputY int32
 }
 
 func GetActiveWindow() (*WindowGeometry, error) {
 	switch DetectCompositor() {
 	case CompositorHyprland:
 		return getHyprlandActiveWindow()
-	case CompositorDWL:
-		return getDWLActiveWindow()
+	case CompositorMango:
+		return getMangoActiveWindow()
 	default:
-		return nil, fmt.Errorf("window capture requires Hyprland or DWL")
+		return nil, fmt.Errorf("window capture requires Hyprland or Mango")
 	}
 }
 
@@ -285,6 +253,93 @@ func getMiracleFocusedMonitor() string {
 	return ""
 }
 
+type mangoMonitor struct {
+	Name   string  `json:"name"`
+	Active bool    `json:"active"`
+	X      int32   `json:"x"`
+	Y      int32   `json:"y"`
+	Scale  float64 `json:"scale"`
+}
+
+func getMangoMonitors() []mangoMonitor {
+	output, err := exec.Command("mmsg", "get", "all-monitors").Output()
+	if err != nil {
+		return nil
+	}
+
+	var data struct {
+		Monitors []mangoMonitor `json:"monitors"`
+	}
+	if err := json.Unmarshal(output, &data); err != nil {
+		return nil
+	}
+	return data.Monitors
+}
+
+func getMangoFocusedMonitor() string {
+	for _, m := range getMangoMonitors() {
+		if m.Active {
+			return m.Name
+		}
+	}
+	return ""
+}
+
+type mangoClient struct {
+	Monitor   string `json:"monitor"`
+	IsFocused bool   `json:"is_focused"`
+	X         int32  `json:"x"`
+	Y         int32  `json:"y"`
+	Width     int32  `json:"width"`
+	Height    int32  `json:"height"`
+}
+
+func getMangoActiveWindow() (*WindowGeometry, error) {
+	output, err := exec.Command("mmsg", "get", "all-clients").Output()
+	if err != nil {
+		return nil, fmt.Errorf("mmsg get all-clients: %w", err)
+	}
+
+	var data struct {
+		Clients []mangoClient `json:"clients"`
+	}
+	if err := json.Unmarshal(output, &data); err != nil {
+		return nil, fmt.Errorf("parse all-clients: %w", err)
+	}
+
+	for _, c := range data.Clients {
+		if !c.IsFocused {
+			continue
+		}
+		if c.Width <= 0 || c.Height <= 0 {
+			return nil, fmt.Errorf("no active window")
+		}
+
+		geom := &WindowGeometry{
+			X:      c.X,
+			Y:      c.Y,
+			Width:  c.Width,
+			Height: c.Height,
+			Output: c.Monitor,
+			Scale:  1.0,
+		}
+		for _, m := range getMangoMonitors() {
+			if m.Name != c.Monitor {
+				continue
+			}
+			geom.OutputX = m.X
+			geom.OutputY = m.Y
+			if m.Scale > 0 {
+				geom.Scale = m.Scale
+			}
+			break
+		}
+		return geom, nil
+	}
+
+	return nil, fmt.Errorf("no focused window")
+}
+
 type niriWorkspace struct {
 	Output    string `json:"output"`
 	IsFocused bool   `json:"is_focused"`
@@ -309,121 +364,6 @@ func getNiriFocusedMonitor() string {
 	return ""
 }
 
-var dwlActiveOutput string
-
-func SetDWLActiveOutput(name string) {
-	dwlActiveOutput = name
-}
-
-func getDWLFocusedMonitor() string {
-	if dwlActiveOutput != "" {
-		return dwlActiveOutput
-	}
-	return queryDWLActiveOutput()
-}
-
-func queryDWLActiveOutput() string {
-	display, err := client.Connect("")
-	if err != nil {
-		return ""
-	}
-	ctx := display.Context()
-	defer ctx.Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return ""
-	}
-
-	var dwlManager *dwl_ipc.ZdwlIpcManagerV2
-	outputs := make(map[uint32]*client.Output)
-
-	registry.SetGlobalHandler(func(e client.RegistryGlobalEvent) {
-		switch e.Interface {
-		case dwl_ipc.ZdwlIpcManagerV2InterfaceName:
-			mgr := dwl_ipc.NewZdwlIpcManagerV2(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, mgr); err == nil {
-				dwlManager = mgr
-			}
-		case client.OutputInterfaceName:
-			out := client.NewOutput(ctx)
-			version := e.Version
-			if version > 4 {
-				version = 4
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, out); err == nil {
-				outputs[e.Name] = out
-			}
-		}
-	})
-
-	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return ""
-	}
-
-	if dwlManager == nil || len(outputs) == 0 {
-		return ""
-	}
-
-	outputNames := make(map[uint32]string)
-	for name, out := range outputs {
-		n := name
-		out.SetNameHandler(func(e client.OutputNameEvent) {
-			outputNames[n] = e.Name
-		})
-	}
-
-	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return ""
-	}
-
-	type outputState struct {
-		name     string
-		active   bool
-		gotFrame bool
-	}
-	states := make(map[uint32]*outputState)
-
-	for name, out := range outputs {
-		dwlOut, err := dwlManager.GetOutput(out)
-		if err != nil {
-			continue
-		}
-		state := &outputState{name: outputNames[name]}
-		states[name] = state
-
-		dwlOut.SetActiveHandler(func(e dwl_ipc.ZdwlIpcOutputV2ActiveEvent) {
-			state.active = e.Active != 0
-		})
-		dwlOut.SetFrameHandler(func(e dwl_ipc.ZdwlIpcOutputV2FrameEvent) {
-			state.gotFrame = true
-		})
-	}
-
-	allFramesReceived := func() bool {
-		for _, s := range states {
-			if !s.gotFrame {
-				return false
-			}
-		}
-		return true
-	}
-
-	for !allFramesReceived() {
-		if err := ctx.Dispatch(); err != nil {
-			return ""
-		}
-	}
-
-	for _, state := range states {
-		if state.active {
-			return state.name
-		}
-	}
-
-	return ""
-}
-
 func GetFocusedMonitor() string {
 	switch DetectCompositor() {
 	case CompositorHyprland:
@@ -436,8 +376,8 @@ func GetFocusedMonitor() string {
 		return getMiracleFocusedMonitor()
 	case CompositorNiri:
 		return getNiriFocusedMonitor()
-	case CompositorDWL:
-		return getDWLFocusedMonitor()
+	case CompositorMango:
+		return getMangoFocusedMonitor()
 	}
 	return ""
 }
@@ -534,161 +474,3 @@ func getAllOutputInfos() map[string]*outputInfo {
 	}
 	return result
 }
-
-func getOutputInfo(outputName string) (*outputInfo, bool) {
-	infos := getAllOutputInfos()
-	if infos == nil {
-		return nil, false
-	}
-	info, ok := infos[outputName]
-	return info, ok
-}
-
-func getDWLActiveWindow() (*WindowGeometry, error) {
-	display, err := client.Connect("")
-	if err != nil {
-		return nil, fmt.Errorf("connect: %w", err)
-	}
-	ctx := display.Context()
-	defer ctx.Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return nil, fmt.Errorf("get registry: %w", err)
-	}
-
-	var dwlManager *dwl_ipc.ZdwlIpcManagerV2
-	outputs := make(map[uint32]*client.Output)
-
-	registry.SetGlobalHandler(func(e client.RegistryGlobalEvent) {
-		switch e.Interface {
-		case dwl_ipc.ZdwlIpcManagerV2InterfaceName:
-			mgr := dwl_ipc.NewZdwlIpcManagerV2(ctx)
-			if err := registry.Bind(e.Name, e.Interface, e.Version, mgr); err == nil {
-				dwlManager = mgr
-			}
-		case client.OutputInterfaceName:
-			out := client.NewOutput(ctx)
-			version := e.Version
-			if version > 4 {
-				version = 4
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, out); err == nil {
-				outputs[e.Name] = out
-			}
-		}
-	})
-
-	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return nil, fmt.Errorf("roundtrip: %w", err)
-	}
-
-	if dwlManager == nil {
-		return nil, fmt.Errorf("dwl_ipc_manager not available")
-	}
-
-	if len(outputs) == 0 {
-		return nil, fmt.Errorf("no outputs found")
-	}
-
-	outputNames := make(map[uint32]string)
-	for name, out := range outputs {
-		n := name
-		out.SetNameHandler(func(e client.OutputNameEvent) {
-			outputNames[n] = e.Name
-		})
-	}
-
-	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return nil, fmt.Errorf("roundtrip: %w", err)
-	}
-
-	type dwlOutputState struct {
-		output      *dwl_ipc.ZdwlIpcOutputV2
-		name        string
-		active      bool
-		x, y        int32
-		w, h        int32
-		scalefactor uint32
-		gotFrame    bool
-	}
-
-	dwlOutputs := make(map[uint32]*dwlOutputState)
-	for name, out := range outputs {
-		dwlOut, err := dwlManager.GetOutput(out)
-		if err != nil {
-			continue
-		}
-		state := &dwlOutputState{output: dwlOut, name: outputNames[name]}
-		dwlOutputs[name] = state
-
-		dwlOut.SetActiveHandler(func(e dwl_ipc.ZdwlIpcOutputV2ActiveEvent) {
-			state.active = e.Active != 0
-		})
-		dwlOut.SetXHandler(func(e dwl_ipc.ZdwlIpcOutputV2XEvent) {
-			state.x = e.X
-		})
-		dwlOut.SetYHandler(func(e dwl_ipc.ZdwlIpcOutputV2YEvent) {
-			state.y = e.Y
-		})
-		dwlOut.SetWidthHandler(func(e dwl_ipc.ZdwlIpcOutputV2WidthEvent) {
-			state.w = e.Width
-		})
-		dwlOut.SetHeightHandler(func(e dwl_ipc.ZdwlIpcOutputV2HeightEvent) {
-			state.h = e.Height
-		})
-		dwlOut.SetScalefactorHandler(func(e dwl_ipc.ZdwlIpcOutputV2ScalefactorEvent) {
-			state.scalefactor = e.Scalefactor
-		})
-		dwlOut.SetFrameHandler(func(e dwl_ipc.ZdwlIpcOutputV2FrameEvent) {
-			state.gotFrame = true
-		})
-	}
-
-	allFramesReceived := func() bool {
-		for _, s := range dwlOutputs {
-			if !s.gotFrame {
-				return false
-			}
-		}
-		return true
-	}
-
-	for !allFramesReceived() {
-		if err := ctx.Dispatch(); err != nil {
-			return nil, fmt.Errorf("dispatch: %w", err)
-		}
-	}
-
-	for _, state := range dwlOutputs {
-		if !state.active {
-			continue
-		}
-		if state.w <= 0 || state.h <= 0 {
-			return nil, fmt.Errorf("no active window")
-		}
-		scale := float64(state.scalefactor) / 100.0
-		if scale <= 0 {
-			scale = 1.0
-		}
-
-		geom := &WindowGeometry{
-			X:      state.x,
-			Y:      state.y,
-			Width:  state.w,
-			Height: state.h,
-			Output: state.name,
-			Scale:  scale,
-		}
-
-		if info, ok := getOutputInfo(state.name); ok {
-			geom.OutputX = info.x
-			geom.OutputY = info.y
-			geom.OutputTransform = info.transform
-		}
-
-		return geom, nil
-	}
-
-	return nil, fmt.Errorf("no active output found")
-}

core/internal/screenshot/screenshot.go

@@ -156,14 +156,14 @@ func (s *Screenshoter) captureWindow() (*CaptureResult, error) {
 	switch DetectCompositor() {
 	case CompositorHyprland:
 		return s.captureAndCrop(output, region)
-	case CompositorDWL:
-		return s.captureDWLWindow(output, region, geom)
+	case CompositorMango:
+		return s.captureMangoWindow(output, region, geom)
 	default:
 		return s.captureRegionOnOutput(output, region)
 	}
 }
 
-func (s *Screenshoter) captureDWLWindow(output *WaylandOutput, region Region, geom *WindowGeometry) (*CaptureResult, error) {
+func (s *Screenshoter) captureMangoWindow(output *WaylandOutput, region Region, geom *WindowGeometry) (*CaptureResult, error) {
 	result, err := s.captureWholeOutput(output)
 	if err != nil {
 		return nil, err
@@ -628,7 +628,7 @@ func (s *Screenshoter) captureRegionOnOutput(output *WaylandOutput, region Regio
 	w := int32(float64(region.Width) * scale)
 	h := int32(float64(region.Height) * scale)
 
-	if DetectCompositor() == CompositorDWL {
+	if DetectCompositor() == CompositorMango {
 		scaledOutW := int32(float64(output.width) * scale)
 		scaledOutH := int32(float64(output.height) * scale)
 		if localX >= scaledOutW {

core/internal/server/clipboard/manager.go

@@ -935,7 +935,7 @@ func (m *Manager) CreateHistoryEntryFromPinned(pinnedEntry *Entry) error {
 		Pinned:    false,
 	}
 
-	if err := m.storeEntryWithoutDedup(newEntry); err != nil {
+	if err := m.storeEntry(newEntry); err != nil {
 		return err
 	}
 
@@ -945,36 +945,6 @@ func (m *Manager) CreateHistoryEntryFromPinned(pinnedEntry *Entry) error {
 	return nil
 }
 
-func (m *Manager) storeEntryWithoutDedup(entry Entry) error {
-	if m.db == nil {
-		return fmt.Errorf("database not available")
-	}
-
-	entry.Hash = computeHash(entry.Data)
-
-	return m.db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("clipboard"))
-
-		id, err := b.NextSequence()
-		if err != nil {
-			return err
-		}
-
-		entry.ID = id
-
-		encoded, err := encodeEntry(entry)
-		if err != nil {
-			return err
-		}
-
-		if err := b.Put(itob(id), encoded); err != nil {
-			return err
-		}
-
-		return m.trimLengthInTx(b)
-	})
-}
-
 func (m *Manager) ClearHistory() {
 	if m.db == nil {
 		return
@@ -1653,6 +1623,37 @@ func (m *Manager) UnpinEntry(id uint64) error {
 			return err
 		}
 
+		if entry.Pinned {
+			currentKey := itob(id)
+			var keepKey []byte
+			var deleteKeys [][]byte
+
+			c := b.Cursor()
+			for k, v := c.Last(); k != nil; k, v = c.Prev() {
+				if bytes.Equal(k, currentKey) || extractHash(v) != entry.Hash {
+					continue
+				}
+				duplicate, err := decodeEntryMeta(v)
+				if err == nil && !duplicate.Pinned {
+					key := append([]byte(nil), k...)
+					if keepKey == nil {
+						keepKey = key
+					} else {
+						deleteKeys = append(deleteKeys, key)
+					}
+				}
+			}
+
+			if keepKey != nil {
+				for _, key := range deleteKeys {
+					if err := b.Delete(key); err != nil {
+						return err
+					}
+				}
+				return b.Delete(currentKey)
+			}
+		}
+
 		entry.Pinned = false
 		encoded, err := encodeEntry(entry)
 		if err != nil {

core/internal/server/clipboard/manager_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	bolt "go.etcd.io/bbolt"
 
 	mocks_wlcontext "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/wlcontext"
 )
@@ -273,6 +274,110 @@ func TestHandleGetEntry_MissingIDReturnsNullResult(t *testing.T) {
 	assert.Nil(t, resp.Result)
 }
 
+func TestUnpinEntry_KeepsTopUnpinnedDuplicate(t *testing.T) {
+	m := newTestManagerWithDB(t)
+
+	require.NoError(t, m.storeEntry(Entry{
+		Data:      []byte("saved content"),
+		MimeType:  "text/plain;charset=utf-8",
+		Preview:   "saved content",
+		Size:      len("saved content"),
+		Timestamp: time.Now().Add(-time.Minute).Truncate(time.Second),
+		IsImage:   false,
+	}))
+
+	history := m.GetHistory()
+	require.Len(t, history, 1)
+	pinnedID := history[0].ID
+	require.NoError(t, m.PinEntry(pinnedID))
+
+	pinnedEntry, err := m.GetEntry(pinnedID)
+	require.NoError(t, err)
+	require.True(t, pinnedEntry.Pinned)
+
+	// Bypass storeEntry to simulate legacy duplicate ordinary history entries.
+	insertLegacyUnpinnedDuplicate := func(timestamp time.Time) Entry {
+		duplicate := Entry{
+			Data:      pinnedEntry.Data,
+			MimeType:  pinnedEntry.MimeType,
+			Preview:   pinnedEntry.Preview,
+			Size:      pinnedEntry.Size,
+			Timestamp: timestamp,
+			IsImage:   pinnedEntry.IsImage,
+			Pinned:    false,
+		}
+		duplicate.Hash = computeHash(duplicate.Data)
+
+		require.NoError(t, m.db.Update(func(tx *bolt.Tx) error {
+			b := tx.Bucket([]byte("clipboard"))
+			id, err := b.NextSequence()
+			if err != nil {
+				return err
+			}
+			duplicate.ID = id
+
+			encoded, err := encodeEntry(duplicate)
+			if err != nil {
+				return err
+			}
+			return b.Put(itob(id), encoded)
+		}))
+
+		return duplicate
+	}
+
+	olderHistoryDuplicate := insertLegacyUnpinnedDuplicate(time.Now().Add(time.Hour))
+	topHistoryDuplicate := insertLegacyUnpinnedDuplicate(time.Now().Add(-time.Hour))
+	require.Greater(t, topHistoryDuplicate.ID, olderHistoryDuplicate.ID)
+	require.True(t, olderHistoryDuplicate.Timestamp.After(topHistoryDuplicate.Timestamp))
+
+	history = m.GetHistory()
+	require.Len(t, history, 3)
+	require.Equal(t, topHistoryDuplicate.ID, history[0].ID)
+	require.NoError(t, m.UnpinEntry(pinnedID))
+
+	history = m.GetHistory()
+	require.Len(t, history, 1)
+	assert.False(t, history[0].Pinned)
+	assert.Equal(t, pinnedEntry.Hash, history[0].Hash)
+	assert.Equal(t, topHistoryDuplicate.ID, history[0].ID)
+}
+
+func TestCreateHistoryEntryFromPinned_KeepsLatestUnpinnedDuplicate(t *testing.T) {
+	m := newTestManagerWithDB(t)
+
+	require.NoError(t, m.storeEntry(Entry{
+		Data:      []byte("saved content"),
+		MimeType:  "text/plain;charset=utf-8",
+		Preview:   "saved content",
+		Size:      len("saved content"),
+		Timestamp: time.Now().Add(-time.Minute).Truncate(time.Second),
+		IsImage:   false,
+	}))
+
+	history := m.GetHistory()
+	require.Len(t, history, 1)
+	pinnedID := history[0].ID
+	require.NoError(t, m.PinEntry(pinnedID))
+
+	pinnedEntry, err := m.GetEntry(pinnedID)
+	require.NoError(t, err)
+	require.True(t, pinnedEntry.Pinned)
+	require.NoError(t, m.CreateHistoryEntryFromPinned(pinnedEntry))
+	firstDuplicate := m.GetHistory()[0]
+	require.NotEqual(t, pinnedID, firstDuplicate.ID)
+	require.NoError(t, m.CreateHistoryEntryFromPinned(pinnedEntry))
+	latestDuplicate := m.GetHistory()[0]
+
+	history = m.GetHistory()
+	require.Len(t, history, 2)
+	assert.Equal(t, latestDuplicate.ID, history[0].ID)
+	assert.False(t, history[0].Pinned)
+	assert.Equal(t, pinnedID, history[1].ID)
+	assert.True(t, history[1].Pinned)
+	assert.NotEqual(t, firstDuplicate.ID, latestDuplicate.ID)
+}
+
 func TestManager_ConcurrentSubscriberAccess(t *testing.T) {
 	m := &Manager{
 		subscribers: make(map[string]chan State),

core/internal/server/dwl/handlers.go

@@ -1,138 +0,0 @@
-package dwl
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-)
-
-type SuccessResult struct {
-	Success bool   `json:"success"`
-	Message string `json:"message"`
-}
-
-func HandleRequest(conn net.Conn, req models.Request, manager *Manager) {
-	if manager == nil {
-		models.RespondError(conn, req.ID, "dwl manager not initialized")
-		return
-	}
-
-	switch req.Method {
-	case "dwl.getState":
-		handleGetState(conn, req, manager)
-	case "dwl.setTags":
-		handleSetTags(conn, req, manager)
-	case "dwl.setClientTags":
-		handleSetClientTags(conn, req, manager)
-	case "dwl.setLayout":
-		handleSetLayout(conn, req, manager)
-	case "dwl.subscribe":
-		handleSubscribe(conn, req, manager)
-	default:
-		models.RespondError(conn, req.ID, fmt.Sprintf("unknown method: %s", req.Method))
-	}
-}
-
-func handleGetState(conn net.Conn, req models.Request, manager *Manager) {
-	state := manager.GetState()
-	models.Respond(conn, req.ID, state)
-}
-
-func handleSetTags(conn net.Conn, req models.Request, manager *Manager) {
-	output, ok := models.Get[string](req, "output")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'output' parameter")
-		return
-	}
-
-	tagmask, ok := models.Get[float64](req, "tagmask")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'tagmask' parameter")
-		return
-	}
-
-	toggleTagset, ok := models.Get[float64](req, "toggleTagset")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'toggleTagset' parameter")
-		return
-	}
-
-	if err := manager.SetTags(output, uint32(tagmask), uint32(toggleTagset)); err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	models.Respond(conn, req.ID, SuccessResult{Success: true, Message: "tags set"})
-}
-
-func handleSetClientTags(conn net.Conn, req models.Request, manager *Manager) {
-	output, ok := models.Get[string](req, "output")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'output' parameter")
-		return
-	}
-
-	andTags, ok := models.Get[float64](req, "andTags")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'andTags' parameter")
-		return
-	}
-
-	xorTags, ok := models.Get[float64](req, "xorTags")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'xorTags' parameter")
-		return
-	}
-
-	if err := manager.SetClientTags(output, uint32(andTags), uint32(xorTags)); err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	models.Respond(conn, req.ID, SuccessResult{Success: true, Message: "client tags set"})
-}
-
-func handleSetLayout(conn net.Conn, req models.Request, manager *Manager) {
-	output, ok := models.Get[string](req, "output")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'output' parameter")
-		return
-	}
-
-	index, ok := models.Get[float64](req, "index")
-	if !ok {
-		models.RespondError(conn, req.ID, "missing or invalid 'index' parameter")
-		return
-	}
-
-	if err := manager.SetLayout(output, uint32(index)); err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	models.Respond(conn, req.ID, SuccessResult{Success: true, Message: "layout set"})
-}
-
-func handleSubscribe(conn net.Conn, req models.Request, manager *Manager) {
-	clientID := fmt.Sprintf("client-%p", conn)
-	stateChan := manager.Subscribe(clientID)
-	defer manager.Unsubscribe(clientID)
-
-	initialState := manager.GetState()
-	if err := json.NewEncoder(conn).Encode(models.Response[State]{
-		ID:     req.ID,
-		Result: &initialState,
-	}); err != nil {
-		return
-	}
-
-	for state := range stateChan {
-		if err := json.NewEncoder(conn).Encode(models.Response[State]{
-			Result: &state,
-		}); err != nil {
-			return
-		}
-	}
-}

core/internal/server/dwl/manager.go

@@ -1,522 +0,0 @@
-package dwl
-
-import (
-	"fmt"
-	"time"
-
-	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/dwl_ipc"
-)
-
-func NewManager(display wlclient.WaylandDisplay) (*Manager, error) {
-	m := &Manager{
-		display:        display,
-		ctx:            display.Context(),
-		cmdq:           make(chan cmd, 128),
-		outputSetupReq: make(chan uint32, 16),
-		stopChan:       make(chan struct{}),
-
-		dirty:   make(chan struct{}, 1),
-		layouts: make([]string, 0),
-	}
-
-	if err := m.setupRegistry(); err != nil {
-		return nil, err
-	}
-
-	m.updateState()
-
-	m.notifierWg.Add(1)
-	go m.notifier()
-
-	m.wg.Add(1)
-	go m.waylandActor()
-
-	return m, nil
-}
-
-func (m *Manager) post(fn func()) {
-	select {
-	case m.cmdq <- cmd{fn: fn}:
-	default:
-		log.Warn("DWL actor command queue full, dropping command")
-	}
-}
-
-func (m *Manager) waylandActor() {
-	defer m.wg.Done()
-
-	for {
-		select {
-		case <-m.stopChan:
-			return
-		case c := <-m.cmdq:
-			c.fn()
-		case outputID := <-m.outputSetupReq:
-			out, exists := m.outputs.Load(outputID)
-			if !exists {
-				log.Warnf("DWL: Output %d no longer exists, skipping setup", outputID)
-				continue
-			}
-
-			if out.ipcOutput != nil {
-				continue
-			}
-
-			mgr, ok := m.manager.(*dwl_ipc.ZdwlIpcManagerV2)
-			if !ok || mgr == nil {
-				log.Errorf("DWL: Manager not available for output %d setup", outputID)
-				continue
-			}
-
-			log.Infof("DWL: Setting up ipcOutput for dynamically added output %d", outputID)
-			if err := m.setupOutput(mgr, out.output); err != nil {
-				log.Errorf("DWL: Failed to setup output %d: %v", outputID, err)
-			} else {
-				m.updateState()
-			}
-		}
-	}
-}
-
-func (m *Manager) setupRegistry() error {
-	log.Info("DWL: starting registry setup")
-
-	registry, err := m.display.GetRegistry()
-	if err != nil {
-		return fmt.Errorf("failed to get registry: %w", err)
-	}
-	m.registry = registry
-
-	outputs := make([]*wlclient.Output, 0)
-	outputRegNames := make(map[uint32]uint32)
-	var dwlMgr *dwl_ipc.ZdwlIpcManagerV2
-
-	registry.SetGlobalHandler(func(e wlclient.RegistryGlobalEvent) {
-		switch e.Interface {
-		case dwl_ipc.ZdwlIpcManagerV2InterfaceName:
-			log.Infof("DWL: found %s", dwl_ipc.ZdwlIpcManagerV2InterfaceName)
-			manager := dwl_ipc.NewZdwlIpcManagerV2(m.ctx)
-			version := e.Version
-			if version > 2 {
-				version = 2
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, manager); err == nil {
-				dwlMgr = manager
-				log.Info("DWL: manager bound successfully")
-
-				// Set handlers immediately after binding, before roundtrips
-				manager.SetTagsHandler(func(e dwl_ipc.ZdwlIpcManagerV2TagsEvent) {
-					log.Infof("DWL: Tags count: %d", e.Amount)
-					m.tagCount = e.Amount
-					m.updateState()
-				})
-
-				manager.SetLayoutHandler(func(e dwl_ipc.ZdwlIpcManagerV2LayoutEvent) {
-					log.Infof("DWL: Layout: %s", e.Name)
-					m.layouts = append(m.layouts, e.Name)
-					m.updateState()
-				})
-			} else {
-				log.Errorf("DWL: failed to bind manager: %v", err)
-			}
-		case "wl_output":
-			log.Debugf("DWL: found wl_output (name=%d)", e.Name)
-			output := wlclient.NewOutput(m.ctx)
-
-			outState := &outputState{
-				registryName: e.Name,
-				output:       output,
-				tags:         make([]TagState, 0),
-			}
-
-			output.SetNameHandler(func(ev wlclient.OutputNameEvent) {
-				log.Debugf("DWL: Output name: %s (registry=%d)", ev.Name, e.Name)
-				outState.name = ev.Name
-			})
-
-			output.SetDescriptionHandler(func(ev wlclient.OutputDescriptionEvent) {
-				log.Debugf("DWL: Output description: %s", ev.Description)
-			})
-
-			version := e.Version
-			if version > 4 {
-				version = 4
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, output); err == nil {
-				outputID := output.ID()
-				outState.id = outputID
-				log.Infof("DWL: Bound wl_output id=%d registry_name=%d", outputID, e.Name)
-				outputs = append(outputs, output)
-				outputRegNames[outputID] = e.Name
-
-				m.outputs.Store(outputID, outState)
-
-				if m.manager != nil {
-					select {
-					case m.outputSetupReq <- outputID:
-						log.Debugf("DWL: Queued setup for output %d", outputID)
-					default:
-						log.Warnf("DWL: Setup queue full, output %d will not be initialized", outputID)
-					}
-				}
-			} else {
-				log.Errorf("DWL: Failed to bind wl_output: %v", err)
-			}
-		}
-	})
-
-	registry.SetGlobalRemoveHandler(func(e wlclient.RegistryGlobalRemoveEvent) {
-		m.post(func() {
-			var outToRelease *outputState
-			m.outputs.Range(func(id uint32, out *outputState) bool {
-				if out.registryName == e.Name {
-					log.Infof("DWL: Output %d removed", id)
-					outToRelease = out
-					m.outputs.Delete(id)
-					return false
-				}
-				return true
-			})
-
-			if outToRelease != nil {
-				if ipcOut, ok := outToRelease.ipcOutput.(*dwl_ipc.ZdwlIpcOutputV2); ok && ipcOut != nil {
-					m.wlMutex.Lock()
-					ipcOut.Release()
-					m.wlMutex.Unlock()
-					log.Debugf("DWL: Released ipcOutput for removed output %d", outToRelease.id)
-				}
-				m.updateState()
-			}
-		})
-	})
-
-	if err := m.display.Roundtrip(); err != nil {
-		return fmt.Errorf("first roundtrip failed: %w", err)
-	}
-	if err := m.display.Roundtrip(); err != nil {
-		return fmt.Errorf("second roundtrip failed: %w", err)
-	}
-
-	if dwlMgr == nil {
-		log.Info("DWL: manager not found in registry")
-		return fmt.Errorf("dwl_ipc_manager_v2 not available")
-	}
-
-	m.manager = dwlMgr
-
-	for _, output := range outputs {
-		if err := m.setupOutput(dwlMgr, output); err != nil {
-			log.Warnf("DWL: Failed to setup output %d: %v", output.ID(), err)
-		}
-	}
-
-	if err := m.display.Roundtrip(); err != nil {
-		return fmt.Errorf("final roundtrip failed: %w", err)
-	}
-
-	log.Info("DWL: registry setup complete")
-	return nil
-}
-
-func (m *Manager) setupOutput(manager *dwl_ipc.ZdwlIpcManagerV2, output *wlclient.Output) error {
-	m.wlMutex.Lock()
-	ipcOutput, err := manager.GetOutput(output)
-	m.wlMutex.Unlock()
-	if err != nil {
-		return fmt.Errorf("failed to get dwl output: %w", err)
-	}
-
-	outState, exists := m.outputs.Load(output.ID())
-	if !exists {
-		return fmt.Errorf("output state not found for id %d", output.ID())
-	}
-	outState.ipcOutput = ipcOutput
-
-	ipcOutput.SetActiveHandler(func(e dwl_ipc.ZdwlIpcOutputV2ActiveEvent) {
-		outState.active = e.Active
-	})
-
-	ipcOutput.SetTagHandler(func(e dwl_ipc.ZdwlIpcOutputV2TagEvent) {
-		updated := false
-		for i, tag := range outState.tags {
-			if tag.Tag == e.Tag {
-				outState.tags[i] = TagState{
-					Tag:     e.Tag,
-					State:   e.State,
-					Clients: e.Clients,
-					Focused: e.Focused,
-				}
-				updated = true
-				break
-			}
-		}
-
-		if !updated {
-			outState.tags = append(outState.tags, TagState{
-				Tag:     e.Tag,
-				State:   e.State,
-				Clients: e.Clients,
-				Focused: e.Focused,
-			})
-		}
-
-		m.updateState()
-	})
-
-	ipcOutput.SetLayoutHandler(func(e dwl_ipc.ZdwlIpcOutputV2LayoutEvent) {
-		outState.layout = e.Layout
-	})
-
-	ipcOutput.SetTitleHandler(func(e dwl_ipc.ZdwlIpcOutputV2TitleEvent) {
-		outState.title = e.Title
-	})
-
-	ipcOutput.SetAppidHandler(func(e dwl_ipc.ZdwlIpcOutputV2AppidEvent) {
-		outState.appID = e.Appid
-	})
-
-	ipcOutput.SetLayoutSymbolHandler(func(e dwl_ipc.ZdwlIpcOutputV2LayoutSymbolEvent) {
-		outState.layoutSymbol = e.Layout
-	})
-
-	ipcOutput.SetKbLayoutHandler(func(e dwl_ipc.ZdwlIpcOutputV2KbLayoutEvent) {
-		outState.kbLayout = e.KbLayout
-	})
-
-	ipcOutput.SetKeymodeHandler(func(e dwl_ipc.ZdwlIpcOutputV2KeymodeEvent) {
-		outState.keymode = e.Keymode
-	})
-
-	ipcOutput.SetFrameHandler(func(e dwl_ipc.ZdwlIpcOutputV2FrameEvent) {
-		m.updateState()
-	})
-
-	return nil
-}
-
-func (m *Manager) updateState() {
-	outputs := make(map[string]*OutputState)
-	activeOutput := ""
-
-	m.outputs.Range(func(key uint32, out *outputState) bool {
-		name := out.name
-		if name == "" {
-			name = fmt.Sprintf("output-%d", out.id)
-		}
-
-		tagsCopy := make([]TagState, len(out.tags))
-		copy(tagsCopy, out.tags)
-
-		outputs[name] = &OutputState{
-			Name:         name,
-			Active:       out.active,
-			Tags:         tagsCopy,
-			Layout:       out.layout,
-			LayoutSymbol: out.layoutSymbol,
-			Title:        out.title,
-			AppID:        out.appID,
-			KbLayout:     out.kbLayout,
-			Keymode:      out.keymode,
-		}
-
-		if out.active != 0 {
-			activeOutput = name
-		}
-		return true
-	})
-
-	newState := State{
-		Outputs:      outputs,
-		TagCount:     m.tagCount,
-		Layouts:      m.layouts,
-		ActiveOutput: activeOutput,
-	}
-
-	m.stateMutex.Lock()
-	m.state = &newState
-	m.stateMutex.Unlock()
-
-	m.notifySubscribers()
-}
-
-func (m *Manager) notifier() {
-	defer m.notifierWg.Done()
-	const minGap = 100 * time.Millisecond
-	timer := time.NewTimer(minGap)
-	timer.Stop()
-	var pending bool
-
-	for {
-		select {
-		case <-m.stopChan:
-			timer.Stop()
-			return
-		case <-m.dirty:
-			if pending {
-				continue
-			}
-			pending = true
-			timer.Reset(minGap)
-		case <-timer.C:
-			if !pending {
-				continue
-			}
-
-			currentState := m.GetState()
-
-			if m.lastNotified != nil && !stateChanged(m.lastNotified, &currentState) {
-				pending = false
-				continue
-			}
-
-			m.subscribers.Range(func(key string, ch chan State) bool {
-				select {
-				case ch <- currentState:
-				default:
-					log.Warn("DWL: subscriber channel full, dropping update")
-				}
-				return true
-			})
-
-			stateCopy := currentState
-			m.lastNotified = &stateCopy
-			pending = false
-		}
-	}
-}
-
-func (m *Manager) ensureOutputSetup(out *outputState) error {
-	if out.ipcOutput != nil {
-		return nil
-	}
-
-	return fmt.Errorf("output not yet initialized - setup in progress, retry in a moment")
-}
-
-func (m *Manager) SetTags(outputName string, tagmask uint32, toggleTagset uint32) error {
-	availableOutputs := make([]string, 0)
-	var targetOut *outputState
-	m.outputs.Range(func(key uint32, out *outputState) bool {
-		name := out.name
-		if name == "" {
-			name = fmt.Sprintf("output-%d", out.id)
-		}
-		availableOutputs = append(availableOutputs, name)
-		if name == outputName {
-			targetOut = out
-			return false
-		}
-		return true
-	})
-
-	if targetOut == nil {
-		return fmt.Errorf("output not found: %s (available: %v)", outputName, availableOutputs)
-	}
-
-	if err := m.ensureOutputSetup(targetOut); err != nil {
-		return fmt.Errorf("failed to setup output %s: %w", outputName, err)
-	}
-
-	ipcOut, ok := targetOut.ipcOutput.(*dwl_ipc.ZdwlIpcOutputV2)
-	if !ok {
-		return fmt.Errorf("output %s has invalid ipcOutput type", outputName)
-	}
-
-	m.wlMutex.Lock()
-	err := ipcOut.SetTags(tagmask, toggleTagset)
-	m.wlMutex.Unlock()
-	return err
-}
-
-func (m *Manager) SetClientTags(outputName string, andTags uint32, xorTags uint32) error {
-	var targetOut *outputState
-	m.outputs.Range(func(key uint32, out *outputState) bool {
-		name := out.name
-		if name == "" {
-			name = fmt.Sprintf("output-%d", out.id)
-		}
-		if name == outputName {
-			targetOut = out
-			return false
-		}
-		return true
-	})
-
-	if targetOut == nil {
-		return fmt.Errorf("output not found: %s", outputName)
-	}
-
-	if err := m.ensureOutputSetup(targetOut); err != nil {
-		return fmt.Errorf("failed to setup output %s: %w", outputName, err)
-	}
-
-	ipcOut, ok := targetOut.ipcOutput.(*dwl_ipc.ZdwlIpcOutputV2)
-	if !ok {
-		return fmt.Errorf("output %s has invalid ipcOutput type", outputName)
-	}
-
-	m.wlMutex.Lock()
-	err := ipcOut.SetClientTags(andTags, xorTags)
-	m.wlMutex.Unlock()
-	return err
-}
-
-func (m *Manager) SetLayout(outputName string, index uint32) error {
-	var targetOut *outputState
-	m.outputs.Range(func(key uint32, out *outputState) bool {
-		name := out.name
-		if name == "" {
-			name = fmt.Sprintf("output-%d", out.id)
-		}
-		if name == outputName {
-			targetOut = out
-			return false
-		}
-		return true
-	})
-
-	if targetOut == nil {
-		return fmt.Errorf("output not found: %s", outputName)
-	}
-
-	if err := m.ensureOutputSetup(targetOut); err != nil {
-		return fmt.Errorf("failed to setup output %s: %w", outputName, err)
-	}
-
-	ipcOut, ok := targetOut.ipcOutput.(*dwl_ipc.ZdwlIpcOutputV2)
-	if !ok {
-		return fmt.Errorf("output %s has invalid ipcOutput type", outputName)
-	}
-
-	m.wlMutex.Lock()
-	err := ipcOut.SetLayout(index)
-	m.wlMutex.Unlock()
-	return err
-}
-
-func (m *Manager) Close() {
-	close(m.stopChan)
-	m.wg.Wait()
-	m.notifierWg.Wait()
-
-	m.subscribers.Range(func(key string, ch chan State) bool {
-		close(ch)
-		m.subscribers.Delete(key)
-		return true
-	})
-
-	m.outputs.Range(func(key uint32, out *outputState) bool {
-		if ipcOut, ok := out.ipcOutput.(*dwl_ipc.ZdwlIpcOutputV2); ok {
-			ipcOut.Release()
-		}
-		m.outputs.Delete(key)
-		return true
-	})
-
-	if mgr, ok := m.manager.(*dwl_ipc.ZdwlIpcManagerV2); ok {
-		mgr.Release()
-	}
-}

core/internal/server/dwl/manager_test.go

@@ -1,366 +0,0 @@
-package dwl
-
-import (
-	"errors"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	mocks_wlclient "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/wlclient"
-)
-
-func TestStateChanged_BothNil(t *testing.T) {
-	assert.True(t, stateChanged(nil, nil))
-}
-
-func TestStateChanged_OneNil(t *testing.T) {
-	s := &State{TagCount: 9}
-	assert.True(t, stateChanged(s, nil))
-	assert.True(t, stateChanged(nil, s))
-}
-
-func TestStateChanged_TagCountDiffers(t *testing.T) {
-	a := &State{TagCount: 9, Outputs: make(map[string]*OutputState), Layouts: []string{}}
-	b := &State{TagCount: 10, Outputs: make(map[string]*OutputState), Layouts: []string{}}
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_LayoutLengthDiffers(t *testing.T) {
-	a := &State{TagCount: 9, Layouts: []string{"tile"}, Outputs: make(map[string]*OutputState)}
-	b := &State{TagCount: 9, Layouts: []string{"tile", "monocle"}, Outputs: make(map[string]*OutputState)}
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_ActiveOutputDiffers(t *testing.T) {
-	a := &State{TagCount: 9, ActiveOutput: "eDP-1", Outputs: make(map[string]*OutputState), Layouts: []string{}}
-	b := &State{TagCount: 9, ActiveOutput: "HDMI-A-1", Outputs: make(map[string]*OutputState), Layouts: []string{}}
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_OutputCountDiffers(t *testing.T) {
-	a := &State{
-		TagCount: 9,
-		Outputs:  map[string]*OutputState{"eDP-1": {}},
-		Layouts:  []string{},
-	}
-	b := &State{
-		TagCount: 9,
-		Outputs:  map[string]*OutputState{},
-		Layouts:  []string{},
-	}
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_OutputFieldsDiffer(t *testing.T) {
-	a := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Active: 1, Layout: 0, Title: "Firefox"},
-		},
-	}
-	b := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Active: 0, Layout: 0, Title: "Firefox"},
-		},
-	}
-	assert.True(t, stateChanged(a, b))
-
-	b.Outputs["eDP-1"].Active = 1
-	b.Outputs["eDP-1"].Layout = 1
-	assert.True(t, stateChanged(a, b))
-
-	b.Outputs["eDP-1"].Layout = 0
-	b.Outputs["eDP-1"].Title = "Code"
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_TagsDiffer(t *testing.T) {
-	a := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Tags: []TagState{{Tag: 1, State: 1, Clients: 2, Focused: 1}}},
-		},
-	}
-	b := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Tags: []TagState{{Tag: 1, State: 2, Clients: 2, Focused: 1}}},
-		},
-	}
-	assert.True(t, stateChanged(a, b))
-
-	b.Outputs["eDP-1"].Tags[0].State = 1
-	b.Outputs["eDP-1"].Tags[0].Clients = 3
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_Equal(t *testing.T) {
-	a := &State{
-		TagCount:     9,
-		ActiveOutput: "eDP-1",
-		Layouts:      []string{"tile", "monocle"},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {
-				Name:         "eDP-1",
-				Active:       1,
-				Layout:       0,
-				LayoutSymbol: "[]=",
-				Title:        "Firefox",
-				AppID:        "firefox",
-				KbLayout:     "us",
-				Keymode:      "",
-				Tags:         []TagState{{Tag: 1, State: 1, Clients: 2, Focused: 1}},
-			},
-		},
-	}
-	b := &State{
-		TagCount:     9,
-		ActiveOutput: "eDP-1",
-		Layouts:      []string{"tile", "monocle"},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {
-				Name:         "eDP-1",
-				Active:       1,
-				Layout:       0,
-				LayoutSymbol: "[]=",
-				Title:        "Firefox",
-				AppID:        "firefox",
-				KbLayout:     "us",
-				Keymode:      "",
-				Tags:         []TagState{{Tag: 1, State: 1, Clients: 2, Focused: 1}},
-			},
-		},
-	}
-	assert.False(t, stateChanged(a, b))
-}
-
-func TestManager_ConcurrentGetState(t *testing.T) {
-	m := &Manager{
-		state: &State{
-			TagCount: 9,
-			Layouts:  []string{"tile"},
-			Outputs:  map[string]*OutputState{"eDP-1": {Name: "eDP-1"}},
-		},
-	}
-
-	var wg sync.WaitGroup
-	const goroutines = 50
-	const iterations = 100
-
-	for i := 0; i < goroutines/2; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			for j := 0; j < iterations; j++ {
-				s := m.GetState()
-				_ = s.TagCount
-				_ = s.Outputs
-			}
-		}()
-	}
-
-	for i := 0; i < goroutines/2; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			for j := 0; j < iterations; j++ {
-				m.stateMutex.Lock()
-				m.state = &State{
-					TagCount: uint32(j % 10),
-					Layouts:  []string{"tile", "monocle"},
-					Outputs:  map[string]*OutputState{"eDP-1": {Active: uint32(j % 2)}},
-				}
-				m.stateMutex.Unlock()
-			}
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func TestManager_ConcurrentSubscriberAccess(t *testing.T) {
-	m := &Manager{
-		stopChan: make(chan struct{}),
-		dirty:    make(chan struct{}, 1),
-	}
-
-	var wg sync.WaitGroup
-	const goroutines = 20
-
-	for i := 0; i < goroutines; i++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-			subID := string(rune('a' + id))
-			ch := m.Subscribe(subID)
-			assert.NotNil(t, ch)
-			time.Sleep(time.Millisecond)
-			m.Unsubscribe(subID)
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func TestManager_SyncmapOutputsConcurrentAccess(t *testing.T) {
-	m := &Manager{}
-
-	var wg sync.WaitGroup
-	const goroutines = 30
-	const iterations = 50
-
-	for i := 0; i < goroutines; i++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-			key := uint32(id)
-
-			for j := 0; j < iterations; j++ {
-				state := &outputState{
-					id:     key,
-					name:   "test-output",
-					active: uint32(j % 2),
-					tags:   []TagState{{Tag: uint32(j), State: 1}},
-				}
-				m.outputs.Store(key, state)
-
-				if loaded, ok := m.outputs.Load(key); ok {
-					assert.Equal(t, key, loaded.id)
-				}
-
-				m.outputs.Range(func(k uint32, v *outputState) bool {
-					_ = v.name
-					_ = v.active
-					return true
-				})
-			}
-
-			m.outputs.Delete(key)
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func TestManager_NotifySubscribersNonBlocking(t *testing.T) {
-	m := &Manager{
-		dirty: make(chan struct{}, 1),
-	}
-
-	for i := 0; i < 10; i++ {
-		m.notifySubscribers()
-	}
-
-	assert.Len(t, m.dirty, 1)
-}
-
-func TestManager_PostQueueFull(t *testing.T) {
-	m := &Manager{
-		cmdq:     make(chan cmd, 2),
-		stopChan: make(chan struct{}),
-	}
-
-	m.post(func() {})
-	m.post(func() {})
-	m.post(func() {})
-	m.post(func() {})
-
-	assert.Len(t, m.cmdq, 2)
-}
-
-func TestManager_GetStateNilState(t *testing.T) {
-	m := &Manager{}
-
-	s := m.GetState()
-	assert.NotNil(t, s.Outputs)
-	assert.NotNil(t, s.Layouts)
-	assert.Equal(t, uint32(0), s.TagCount)
-}
-
-func TestTagState_Fields(t *testing.T) {
-	tag := TagState{
-		Tag:     1,
-		State:   2,
-		Clients: 3,
-		Focused: 1,
-	}
-
-	assert.Equal(t, uint32(1), tag.Tag)
-	assert.Equal(t, uint32(2), tag.State)
-	assert.Equal(t, uint32(3), tag.Clients)
-	assert.Equal(t, uint32(1), tag.Focused)
-}
-
-func TestOutputState_Fields(t *testing.T) {
-	out := OutputState{
-		Name:         "eDP-1",
-		Active:       1,
-		Tags:         []TagState{{Tag: 1}},
-		Layout:       0,
-		LayoutSymbol: "[]=",
-		Title:        "Firefox",
-		AppID:        "firefox",
-		KbLayout:     "us",
-		Keymode:      "",
-	}
-
-	assert.Equal(t, "eDP-1", out.Name)
-	assert.Equal(t, uint32(1), out.Active)
-	assert.Len(t, out.Tags, 1)
-	assert.Equal(t, "[]=", out.LayoutSymbol)
-}
-
-func TestStateChanged_NewOutputAppears(t *testing.T) {
-	a := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Name: "eDP-1"},
-		},
-	}
-	b := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1":    {Name: "eDP-1"},
-			"HDMI-A-1": {Name: "HDMI-A-1"},
-		},
-	}
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestStateChanged_TagsLengthDiffers(t *testing.T) {
-	a := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Tags: []TagState{{Tag: 1}}},
-		},
-	}
-	b := &State{
-		TagCount: 9,
-		Layouts:  []string{},
-		Outputs: map[string]*OutputState{
-			"eDP-1": {Tags: []TagState{{Tag: 1}, {Tag: 2}}},
-		},
-	}
-	assert.True(t, stateChanged(a, b))
-}
-
-func TestNewManager_GetRegistryError(t *testing.T) {
-	mockDisplay := mocks_wlclient.NewMockWaylandDisplay(t)
-
-	mockDisplay.EXPECT().Context().Return(nil)
-	mockDisplay.EXPECT().GetRegistry().Return(nil, errors.New("failed to get registry"))
-
-	_, err := NewManager(mockDisplay)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "failed to get registry")
-}

core/internal/server/dwl/types.go

@@ -1,176 +0,0 @@
-package dwl
-
-import (
-	"sync"
-
-	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
-)
-
-type TagState struct {
-	Tag     uint32 `json:"tag"`
-	State   uint32 `json:"state"`
-	Clients uint32 `json:"clients"`
-	Focused uint32 `json:"focused"`
-}
-
-type OutputState struct {
-	Name         string     `json:"name"`
-	Active       uint32     `json:"active"`
-	Tags         []TagState `json:"tags"`
-	Layout       uint32     `json:"layout"`
-	LayoutSymbol string     `json:"layoutSymbol"`
-	Title        string     `json:"title"`
-	AppID        string     `json:"appId"`
-	KbLayout     string     `json:"kbLayout"`
-	Keymode      string     `json:"keymode"`
-}
-
-type State struct {
-	Outputs      map[string]*OutputState `json:"outputs"`
-	TagCount     uint32                  `json:"tagCount"`
-	Layouts      []string                `json:"layouts"`
-	ActiveOutput string                  `json:"activeOutput"`
-}
-
-type cmd struct {
-	fn func()
-}
-
-type Manager struct {
-	display  wlclient.WaylandDisplay
-	ctx      *wlclient.Context
-	registry *wlclient.Registry
-	manager  any
-
-	outputs syncmap.Map[uint32, *outputState]
-
-	tagCount uint32
-	layouts  []string
-
-	wlMutex        sync.Mutex
-	cmdq           chan cmd
-	outputSetupReq chan uint32
-	stopChan       chan struct{}
-	wg             sync.WaitGroup
-
-	subscribers  syncmap.Map[string, chan State]
-	dirty        chan struct{}
-	notifierWg   sync.WaitGroup
-	lastNotified *State
-
-	stateMutex sync.RWMutex
-	state      *State
-}
-
-type outputState struct {
-	id           uint32
-	registryName uint32
-	output       *wlclient.Output
-	ipcOutput    any
-	name         string
-	active       uint32
-	tags         []TagState
-	layout       uint32
-	layoutSymbol string
-	title        string
-	appID        string
-	kbLayout     string
-	keymode      string
-}
-
-func (m *Manager) GetState() State {
-	m.stateMutex.RLock()
-	defer m.stateMutex.RUnlock()
-	if m.state == nil {
-		return State{
-			Outputs:  make(map[string]*OutputState),
-			Layouts:  []string{},
-			TagCount: 0,
-		}
-	}
-	stateCopy := *m.state
-	return stateCopy
-}
-
-func (m *Manager) Subscribe(id string) chan State {
-	ch := make(chan State, 64)
-
-	m.subscribers.Store(id, ch)
-
-	return ch
-}
-
-func (m *Manager) Unsubscribe(id string) {
-	if val, ok := m.subscribers.LoadAndDelete(id); ok {
-		close(val)
-	}
-}
-
-func (m *Manager) notifySubscribers() {
-	select {
-	case m.dirty <- struct{}{}:
-	default:
-	}
-}
-
-func stateChanged(old, new *State) bool {
-	if old == nil || new == nil {
-		return true
-	}
-	if old.TagCount != new.TagCount {
-		return true
-	}
-	if len(old.Layouts) != len(new.Layouts) {
-		return true
-	}
-	if old.ActiveOutput != new.ActiveOutput {
-		return true
-	}
-	if len(old.Outputs) != len(new.Outputs) {
-		return true
-	}
-
-	for name, newOut := range new.Outputs {
-		oldOut, exists := old.Outputs[name]
-		if !exists {
-			return true
-		}
-		if oldOut.Active != newOut.Active {
-			return true
-		}
-		if oldOut.Layout != newOut.Layout {
-			return true
-		}
-		if oldOut.LayoutSymbol != newOut.LayoutSymbol {
-			return true
-		}
-		if oldOut.Title != newOut.Title {
-			return true
-		}
-		if oldOut.AppID != newOut.AppID {
-			return true
-		}
-		if oldOut.KbLayout != newOut.KbLayout {
-			return true
-		}
-		if oldOut.Keymode != newOut.Keymode {
-			return true
-		}
-		if len(oldOut.Tags) != len(newOut.Tags) {
-			return true
-		}
-		for i, newTag := range newOut.Tags {
-			if i >= len(oldOut.Tags) {
-				return true
-			}
-			oldTag := oldOut.Tags[i]
-			if oldTag.Tag != newTag.Tag || oldTag.State != newTag.State ||
-				oldTag.Clients != newTag.Clients || oldTag.Focused != newTag.Focused {
-				return true
-			}
-		}
-	}
-
-	return false
-}

core/internal/server/router.go

@@ -11,7 +11,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
 	serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/location"
@@ -125,15 +124,6 @@ func RouteRequest(conn net.Conn, req models.Request) {
 		return
 	}
 
-	if strings.HasPrefix(req.Method, "dwl.") {
-		if dwlManager == nil {
-			models.RespondError(conn, req.ID, "dwl manager not initialized")
-			return
-		}
-		dwl.HandleRequest(conn, req, dwlManager)
-		return
-	}
-
 	if strings.HasPrefix(req.Method, "brightness.") {
 		if brightnessManager == nil {
 			models.RespondError(conn, req.ID, "brightness manager not initialized")

core/internal/server/server.go

@@ -22,7 +22,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
 	serverDbus "github.com/AvengeMedia/DankMaterialShell/core/internal/server/dbus"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/location"
@@ -39,7 +38,7 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
 )
 
-const APIVersion = 24
+const APIVersion = 25
 
 var CLIVersion = "dev"
 
@@ -66,7 +65,6 @@ var bluezManager *bluez.Manager
 var appPickerManager *apppicker.Manager
 var cupsManager *cups.Manager
 var tailscaleManager *tailscale.Manager
-var dwlManager *dwl.Manager
 var brightnessManager *brightness.Manager
 var wlrOutputManager *wlroutput.Manager
 var evdevManager *evdev.Manager
@@ -252,30 +250,6 @@ func InitializeCupsManager() error {
 	return nil
 }
 
-func InitializeDwlManager() error {
-	log.Info("Attempting to initialize DWL IPC...")
-
-	if wlContext == nil {
-		ctx, err := wlcontext.New()
-		if err != nil {
-			log.Errorf("Failed to create shared Wayland context: %v", err)
-			return err
-		}
-		wlContext = ctx
-	}
-
-	manager, err := dwl.NewManager(wlContext.Display())
-	if err != nil {
-		log.Debug("Failed to initialize dwl manager: %v", err)
-		return err
-	}
-
-	dwlManager = manager
-
-	log.Info("DWL IPC initialized successfully")
-	return nil
-}
-
 func InitializeBrightnessManager() error {
 	manager, err := brightness.NewManager()
 	if err != nil {
@@ -468,10 +442,6 @@ func getCapabilities() Capabilities {
 		caps = append(caps, "tailscale")
 	}
 
-	if dwlManager != nil {
-		caps = append(caps, "dwl")
-	}
-
 	if brightnessManager != nil {
 		caps = append(caps, "brightness")
 	}
@@ -538,10 +508,6 @@ func getServerInfo() ServerInfo {
 		caps = append(caps, "tailscale")
 	}
 
-	if dwlManager != nil {
-		caps = append(caps, "dwl")
-	}
-
 	if brightnessManager != nil {
 		caps = append(caps, "brightness")
 	}
@@ -1046,38 +1012,6 @@ func handleSubscribe(conn net.Conn, req models.Request) {
 		}()
 	}
 
-	if shouldSubscribe("dwl") && dwlManager != nil {
-		wg.Add(1)
-		dwlChan := dwlManager.Subscribe(clientID + "-dwl")
-		go func() {
-			defer wg.Done()
-			defer dwlManager.Unsubscribe(clientID + "-dwl")
-
-			initialState := dwlManager.GetState()
-			select {
-			case eventChan <- ServiceEvent{Service: "dwl", Data: initialState}:
-			case <-stopChan:
-				return
-			}
-
-			for {
-				select {
-				case state, ok := <-dwlChan:
-					if !ok {
-						return
-					}
-					select {
-					case eventChan <- ServiceEvent{Service: "dwl", Data: state}:
-					case <-stopChan:
-						return
-					}
-				case <-stopChan:
-					return
-				}
-			}
-		}()
-	}
-
 	if shouldSubscribe("brightness") && brightnessManager != nil {
 		wg.Add(2)
 		brightnessStateChan := brightnessManager.Subscribe(clientID + "-brightness-state")
@@ -1333,9 +1267,6 @@ func cleanupManagers() {
 	if cupsManager != nil {
 		cupsManager.Close()
 	}
-	if dwlManager != nil {
-		dwlManager.Close()
-	}
 	if brightnessManager != nil {
 		brightnessManager.Close()
 	}
@@ -1502,19 +1433,6 @@ func Start(printDocs bool) error {
 		log.Info(" cups.resumePrinter                    - Resume printer (params: printerName)")
 		log.Info(" cups.cancelJob                        - Cancel job (params: printerName, jobID)")
 		log.Info(" cups.purgeJobs                        - Cancel all jobs (params: printerName)")
-		log.Info("DWL:")
-		log.Info(" dwl.getState                          - Get current dwl state (tags, windows, layouts, keyboard)")
-		log.Info(" dwl.setTags                           - Set active tags (params: output, tagmask, toggleTagset)")
-		log.Info(" dwl.setClientTags                     - Set focused client tags (params: output, andTags, xorTags)")
-		log.Info(" dwl.setLayout                         - Set layout (params: output, index)")
-		log.Info(" dwl.subscribe                         - Subscribe to dwl state changes (streaming)")
-		log.Info("   Output state includes:")
-		log.Info("     - tags         : Tag states (active, clients, focused)")
-		log.Info("     - layoutSymbol : Current layout name")
-		log.Info("     - title        : Focused window title")
-		log.Info("     - appId        : Focused window app ID")
-		log.Info("     - kbLayout     : Current keyboard layout")
-		log.Info("     - keymode      : Current keybind mode")
 		log.Info("Brightness:")
 		log.Info(" brightness.getState                   - Get current brightness state for all devices")
 		log.Info(" brightness.setBrightness              - Set device brightness (params: device, percent)")
@@ -1691,10 +1609,6 @@ func Start(printDocs bool) error {
 		log.Debugf("AppPicker manager unavailable: %v", err)
 	}
 
-	if err := InitializeDwlManager(); err != nil {
-		log.Debugf("DWL manager unavailable: %v", err)
-	}
-
 	if err := InitializeWlrOutputManager(); err != nil {
 		log.Debugf("WlrOutput manager unavailable: %v", err)
 	}

docs/IPC.md

@@ -6,6 +6,18 @@ DankMaterialShell provides comprehensive IPC (Inter-Process Communication) funct
 dms ipc call <target> <function> [parameters...]
 ```
 
+## Discovering IPC commands
+
+List all available targets and functions while DMS is running:
+
+```bash
+dms ipc list
+dms ipc          # same
+dms ipc --help   # same, plus usage text
+```
+
+Live listing requires DMS to be running. If listing fails, use this document or the [Keybinds & IPC docs](https://danklinux.com/docs/dankmaterialshell/keybinds-ipc) as an offline reference.
+
 ## Target: `audio`
 
 Audio system control and information.
@@ -707,7 +719,7 @@ File browser controls for selecting wallpapers and profile images.
   - Both browsers support common image formats (jpg, jpeg, png, bmp, gif, webp)
 
 ### Target: `color-picker`
-Color picker modal control.
+In-shell color picker modal for theme and settings color selection.
 
 **Functions:**
 - `open` - Show color picker modal
@@ -718,6 +730,14 @@ Color picker modal control.
 - `toggle` - Toggle color picker modal visibility
 - `toggleInstant` - Toggle color picker modal visibility without animation on hide
 
+**Note:** This controls the in-shell modal. To pick a pixel from the screen via CLI, use `dms color pick` instead (see [Color Picker CLI](https://danklinux.com/docs/dankmaterialshell/cli-color-picker)).
+
+**Examples:**
+```bash
+dms ipc call color-picker toggle
+dms ipc call color-picker openColor "#3f51b5"
+```
+
 ### Target: `hypr`
 Hyprland-specific controls including keybinds cheatsheet and workspace overview (Hyprland only).
 

quickshell/Common/ConnectedModeState.qml

@@ -74,10 +74,6 @@ Singleton {
         }, descriptor);
     }
 
-    function legacySurfaceState(screenName, kind) {
-        return SurfaceDescriptor.toLegacyState(surfaceDescriptor(screenName, kind));
-    }
-
     function hasSurfaceDescriptor(screenName, kind, ownerId) {
         const descriptor = surfaceDescriptor(screenName, kind);
         return descriptor.phase !== "hidden" && (!ownerId || descriptor.ownerId === ownerId);
@@ -124,20 +120,6 @@ Singleton {
         return true;
     }
 
-    function _setSurfaceAnimation(screenName, kind, ownerId, x, y) {
-        const current = surfaceDescriptor(screenName, kind);
-        if (current.phase === "hidden" || (ownerId && current.ownerId !== ownerId))
-            return false;
-        return true;
-    }
-
-    function _setSurfaceBody(screenName, kind, ownerId, x, y, width, height) {
-        const current = surfaceDescriptor(screenName, kind);
-        if (current.phase === "hidden" || (ownerId && current.ownerId !== ownerId))
-            return false;
-        return true;
-    }
-
     readonly property var emptyDockState: ({
             "reveal": false,
             "barSide": "bottom",
@@ -149,7 +131,6 @@ Singleton {
             "slideY": 0
         })
 
-    // Popout state (updated by DankPopout when connectedFrameModeActive)
     property string popoutOwnerId: ""
     property bool popoutVisible: false
     property string popoutBarSide: "top"
@@ -163,14 +144,10 @@ Singleton {
     property bool popoutOmitStartConnector: false
     property bool popoutOmitEndConnector: false
 
-    // Dock state (updated by Dock when connectedFrameModeActive), keyed by screen.name
     property var dockStates: ({})
 
-    // Dock slide offsets — hot-path updates separated from full geometry state
     property var dockSlides: ({})
 
-    // Surfaces are keyed by screen.name. FrameWindow watches to refresh connected chrome
-    // after claim/release boundaries without tracking each animation frame
     property var surfaceRevisions: ({})
 
     function _cloneDict(src) {
@@ -289,7 +266,6 @@ Singleton {
             if (!isNaN(nextY) && popoutAnimY !== nextY)
                 popoutAnimY = nextY;
         }
-        _setSurfaceAnimation(popoutScreen, "popout", claimId, animX, animY);
         return true;
     }
 
@@ -316,7 +292,6 @@ Singleton {
             if (!isNaN(nextH) && popoutBodyH !== nextH)
                 popoutBodyH = nextH;
         }
-        _setSurfaceBody(popoutScreen, "popout", claimId, bodyX, bodyY, bodyW, bodyH);
         return true;
     }
 
@@ -352,8 +327,8 @@ Singleton {
             "phase": normalized.reveal ? (state.phase || "open") : "hidden"
         });
         const previous = dockStates[screenName] || emptyDockState;
-        const legacyChanged = !_sameDockState(dockStates[screenName], normalized);
-        if (legacyChanged) {
+        const stateChanged = !_sameDockState(dockStates[screenName], normalized);
+        if (stateChanged) {
             const next = _cloneDict(dockStates);
             next[screenName] = normalized;
             dockStates = next;
@@ -373,7 +348,6 @@ Singleton {
         dockStates = next;
         _clearSurfaceDescriptor(screenName, "dock");
 
-        // Also clear corresponding slide
         if (dockSlides[screenName]) {
             const nextSlides = _cloneDict(dockSlides);
             delete nextSlides[screenName];
@@ -397,7 +371,6 @@ Singleton {
             "y": numY
         };
         dockSlides = next;
-        _setSurfaceAnimation(screenName, "dock", "dock:" + screenName, numX, numY);
         return true;
     }
 
@@ -451,8 +424,8 @@ Singleton {
             "phase": normalized.visible ? (state.phase || "open") : "hidden"
         });
         const previous = notificationStates[screenName] || emptyNotificationState;
-        const legacyChanged = !_sameNotificationState(notificationStates[screenName], normalized);
-        if (legacyChanged) {
+        const stateChanged = !_sameNotificationState(notificationStates[screenName], normalized);
+        if (stateChanged) {
             const next = _cloneDict(notificationStates);
             next[screenName] = normalized;
             notificationStates = next;
@@ -475,7 +448,6 @@ Singleton {
         return true;
     }
 
-    // DankModal / DankLauncherV2Modal State
     readonly property var emptyModalState: ({
             "visible": false,
             "barSide": "bottom",
@@ -573,10 +545,6 @@ Singleton {
         return updateModalState(screenName, state, ownerId);
     }
 
-    function setModalState(screenName, state) {
-        return updateModalState(screenName, state, null);
-    }
-
     function clearModalState(screenName, ownerId) {
         if (!screenName)
             return false;
@@ -617,7 +585,6 @@ Singleton {
             "animY": nay
         });
         modalStates = next;
-        _setSurfaceAnimation(screenName, "modal", ownerId, animX, animY);
         return true;
     }
 
@@ -641,7 +608,6 @@ Singleton {
             "bodyH": nh
         });
         modalStates = next;
-        _setSurfaceBody(screenName, "modal", ownerId, bodyX, bodyY, bodyW, bodyH);
         return true;
     }
 
@@ -682,9 +648,6 @@ Singleton {
         return false;
     }
 
-    // Prune state for screens that are no longer connected. Stale entries
-    // accumulate across hotplug cycles otherwise — Frame's per-screen
-    // FrameInstance doesn't notice when its peer dicts go orphan.
     function _pruneToLiveScreens() {
         const live = {};
         const screens = Quickshell.screens || [];

quickshell/Common/ConnectedSurfaceDescriptor.js

@@ -157,23 +157,3 @@ function same(a, b, threshold) {
         && a.omitEndConnector === b.omitEndConnector
         && a.dockRetractSide === b.dockRetractSide;
 }
-
-function toLegacyState(descriptor) {
-    var d = normalize(descriptor);
-    return {
-        "visible": d.visible,
-        "reveal": d.visible,
-        "barSide": d.barSide,
-        "bodyX": d.bodyRect.x,
-        "bodyY": d.bodyRect.y,
-        "bodyW": d.bodyRect.width,
-        "bodyH": d.bodyRect.height,
-        "animX": d.animationOffset.x,
-        "animY": d.animationOffset.y,
-        "slideX": d.animationOffset.x,
-        "slideY": d.animationOffset.y,
-        "screen": d.screenName,
-        "omitStartConnector": d.omitStartConnector,
-        "omitEndConnector": d.omitEndConnector
-    };
-}

quickshell/Common/DankSocket.qml

@@ -7,29 +7,31 @@ Item {
     property alias path: socket.path
     property alias parser: socket.parser
     property bool connected: false
+    property bool linkUp: false
 
     property int reconnectBaseMs: 400
     property int reconnectMaxMs: 15000
 
     property int _reconnectAttempt: 0
 
-    signal connectionStateChanged()
+    signal connectionStateChanged
 
     onConnectedChanged: {
-        socket.connected = connected
+        socket.connected = connected;
     }
 
     Socket {
         id: socket
 
         onConnectionStateChanged: {
-            root.connectionStateChanged()
+            root.linkUp = connected;
+            root.connectionStateChanged();
             if (connected) {
-                root._reconnectAttempt = 0
-                return
+                root._reconnectAttempt = 0;
+                return;
             }
             if (root.connected) {
-                root._scheduleReconnect()
+                root._scheduleReconnect();
             }
         }
     }
@@ -39,24 +41,24 @@ Item {
         interval: 0
         repeat: false
         onTriggered: {
-            socket.connected = false
-            Qt.callLater(() => socket.connected = true)
+            socket.connected = false;
+            Qt.callLater(() => socket.connected = true);
         }
     }
 
     function send(data) {
-        const json = typeof data === "string" ? data : JSON.stringify(data)
-        const message = json.endsWith("\n") ? json : json + "\n"
-        socket.write(message)
-        socket.flush()
+        const json = typeof data === "string" ? data : JSON.stringify(data);
+        const message = json.endsWith("\n") ? json : json + "\n";
+        socket.write(message);
+        socket.flush();
     }
 
     function _scheduleReconnect() {
-        const pow = Math.min(_reconnectAttempt, 10)
-        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs)
-        const jitter = Math.floor(Math.random() * Math.floor(base / 4))
-        reconnectTimer.interval = base + jitter
-        reconnectTimer.restart()
-        _reconnectAttempt++
+        const pow = Math.min(_reconnectAttempt, 10);
+        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs);
+        const jitter = Math.floor(Math.random() * Math.floor(base / 4));
+        reconnectTimer.interval = base + jitter;
+        reconnectTimer.restart();
+        _reconnectAttempt++;
     }
 }

quickshell/Common/ElevationShadow.qml

@@ -19,7 +19,6 @@ Item {
     property color borderColor: "transparent"
     property real borderWidth: 0
 
-    // Rounded-rect geometry within the item; defaults fill the item.
     property real sourceX: 0
     property real sourceY: 0
     property real sourceWidth: width
@@ -36,8 +35,6 @@ Item {
     readonly property var _ambient: Theme.elevationAmbient(level)
     readonly property real _pad: shadowEnabled ? Math.ceil(Math.max(shadowBlurPx + shadowSpreadPx + Math.max(Math.abs(shadowOffsetX), Math.abs(shadowOffsetY)), _ambient.blurPx + _ambient.spreadPx) + 2) : 0
 
-    // Fill + border + key/ambient shadows drawn analytically on one oversized
-    // quad — no FBO, no blur passes.
     ShaderEffect {
         anchors.fill: parent
         anchors.margins: -root._pad

quickshell/Common/KeybindActions.js

@@ -56,6 +56,9 @@ const DMS_ACTIONS = [
     { id: "spawn dms ipc call dankdash wallpaper", label: "Wallpaper Browser" },
     { id: "spawn dms ipc call file browse wallpaper", label: "File: Browse Wallpaper" },
     { id: "spawn dms ipc call file browse profile", label: "File: Browse Profile" },
+    { id: "spawn dms ipc call color-picker toggle", label: "Color Picker: Toggle" },
+    { id: "spawn dms ipc call color-picker open", label: "Color Picker: Open" },
+    { id: "spawn dms ipc call color-picker close", label: "Color Picker: Close" },
     { id: "spawn dms ipc call keybinds toggle niri", label: "Keybinds Cheatsheet: Toggle", compositor: "niri" },
     { id: "spawn dms ipc call keybinds open niri", label: "Keybinds Cheatsheet: Open", compositor: "niri" },
     { id: "spawn dms ipc call keybinds close", label: "Keybinds Cheatsheet: Close" },

quickshell/Common/SettingsData.qml

@@ -108,6 +108,7 @@ Singleton {
     }
 
     property bool clipboardEnterToPaste: false
+    property var clipboardVisibleEntryActions: ["pin", "edit", "delete"]
 
     property var launcherPluginVisibility: ({})
 
@@ -181,6 +182,7 @@ Singleton {
 
     property int firstDayOfWeek: -1
     property bool showWeekNumber: false
+    property string calendarBackend: "auto"
     property bool use24HourClock: true
     property bool showSeconds: false
     property bool padHours12Hour: false
@@ -396,6 +398,7 @@ Singleton {
     property bool audioVisualizerEnabled: true
     property string audioScrollMode: "volume"
     property int audioWheelScrollAmount: 5
+    property bool audioDeviceScrollVolumeEnabled: false
     property bool clockCompactMode: false
     property int focusedWindowSize: 1
     property bool focusedWindowCompactMode: false
@@ -403,6 +406,9 @@ Singleton {
     property int barMaxVisibleApps: 0
     property int barMaxVisibleRunningApps: 0
     property bool barShowOverflowBadge: true
+    property bool trayAutoOverflow: true
+    property bool trayPopupSingleLine: true
+    property int trayMaxVisibleItems: 0
     property bool appsDockHideIndicators: false
     property bool appsDockColorizeActive: false
     property string appsDockActiveColorMode: "primary"
@@ -489,9 +495,6 @@ Singleton {
                 "hideOnTouch": false,
                 "inactiveTimeout": 0
             },
-            "dwl": {
-                "cursorHideTimeout": 0
-            },
             "mango": {
                 "cursorHideTimeout": 0
             }
@@ -518,14 +521,42 @@ Singleton {
     property bool notepadUseMonospace: true
     property string notepadFontFamily: ""
     property real notepadFontSize: 14
+    property real notificationSummaryFontSize: Spec.SPEC.notificationSummaryFontSize.def
+    property real notificationBodyFontSize: Spec.SPEC.notificationBodyFontSize.def
     property bool notepadShowLineNumbers: false
+    property bool notepadAutoSave: false
+    property string notepadSlideoutSide: "right"
+    property string notepadDefaultMode: "slideout"
     property real notepadTransparencyOverride: -1
     property real notepadLastCustomTransparency: 0.7
+    property bool notepadUseCompositorGap: false
+    property int notepadEdgeGap: 0
+
+    // Compositor layout gap when enabled and available, else the manual value.
+    readonly property int notepadEffectiveEdgeGap: {
+        if (notepadUseCompositorGap) {
+            var g = -1;
+            if (CompositorService.isNiri)
+                g = niriLayoutGapsOverride;
+            else if (CompositorService.isHyprland)
+                g = hyprlandLayoutGapsOverride;
+            else if (CompositorService.isMango)
+                g = mangoLayoutGapsOverride;
+            if (g >= 0)
+                return g;
+        }
+        return Math.max(0, notepadEdgeGap);
+    }
 
     onNotepadUseMonospaceChanged: saveSettings()
     onNotepadFontFamilyChanged: saveSettings()
     onNotepadFontSizeChanged: saveSettings()
     onNotepadShowLineNumbersChanged: saveSettings()
+    onNotepadAutoSaveChanged: saveSettings()
+    onNotepadSlideoutSideChanged: saveSettings()
+    onNotepadDefaultModeChanged: saveSettings()
+    onNotepadUseCompositorGapChanged: saveSettings()
+    onNotepadEdgeGapChanged: saveSettings()
     // onCenteringModeChanged: saveSettings()
     onNotepadTransparencyOverrideChanged: {
         if (notepadTransparencyOverride > 0) {
@@ -698,6 +729,7 @@ Singleton {
     property int notificationTimeoutNormal: 5000
     property int notificationTimeoutCritical: 0
     property bool notificationCompactMode: false
+    property bool notificationShowTimeoutBar: false
     property bool notificationDedupeEnabled: true
     property int notificationPopupPosition: SettingsData.Position.Top
     property int notificationAnimationSpeed: SettingsData.AnimationSpeed.Short
@@ -1224,8 +1256,6 @@ Singleton {
             NiriService.generateNiriLayoutConfig();
         if (CompositorService.isHyprland && typeof HyprlandService !== "undefined")
             HyprlandService.generateLayoutConfig();
-        if (CompositorService.isDwl && typeof DwlService !== "undefined")
-            DwlService.generateLayoutConfig();
         if (CompositorService.isMango && typeof MangoService !== "undefined")
             MangoService.generateLayoutConfig();
     }
@@ -1652,6 +1682,15 @@ Singleton {
         };
     }
 
+    function effectiveBarConfigForRender(config, usesFrameBarChrome) {
+        if (!config || !connectedFrameModeActive || usesFrameBarChrome)
+            return config;
+        const backup = connectedFrameBarStyleBackups[config.id];
+        if (!backup)
+            return config;
+        return Object.assign({}, config, backup);
+    }
+
     // Single entry point for connected-mode settings state.
     //   !active → restore backups
     function _reconcileConnectedFrameBarStyles() {
@@ -2451,10 +2490,6 @@ Singleton {
             HyprlandService.generateCursorConfig();
             return;
         }
-        if (CompositorService.isDwl && typeof DwlService !== "undefined") {
-            DwlService.generateCursorConfig();
-            return;
-        }
         if (CompositorService.isMango && typeof MangoService !== "undefined") {
             MangoService.generateCursorConfig();
             return;

quickshell/Common/Theme.qml

@@ -911,9 +911,6 @@ Singleton {
         }
         return Qt.rgba(r, g, b, alpha);
     }
-    // Non-directional ambient layer of the M3 two-part shadow model (key +
-    // ambient). Derived from the key level so user intensity/opacity settings
-    // scale both layers together.
     function elevationAmbient(level) {
         const blur = (level && level.blurPx !== undefined) ? Math.max(0, level.blurPx) : 0;
         const alpha = ((level && level.alpha !== undefined) ? level.alpha : 0.3) * 0.5;

quickshell/Common/settings/Processes.qml

@@ -570,7 +570,7 @@ Singleton {
         onExited: exitCode => {
             const enabling = root.settingsRoot && root.settingsRoot.greeterAutoLogin;
             if (exitCode === 0) {
-                ToastService.showWarning(enabling ? I18n.tr("Applying auto-login on startup…") : I18n.tr("Disabling auto-login on startup…"), "", "dms greeter sync --autologin", "greeter-autologin-sync");
+                ToastService.showWarning(enabling ? I18n.tr("Applying auto-login on startup...") : I18n.tr("Disabling auto-login on startup..."), "", "dms greeter sync --autologin", "greeter-autologin-sync");
                 root.greeterAutoLoginSyncProcess.running = true;
                 return;
             }
@@ -645,7 +645,7 @@ Singleton {
         onExited: exitCode => {
             const err = (root.authApplySudoProbeStderr || "").trim();
             if (exitCode === 0) {
-                ToastService.showInfo(I18n.tr("Applying authentication changes…"), "", "", "auth-sync");
+                ToastService.showInfo(I18n.tr("Applying authentication changes..."), "", "", "auth-sync");
                 root.authApplyProcess.running = true;
                 return;
             }

quickshell/Common/settings/SettingsSpec.js

@@ -37,6 +37,7 @@ var SPEC = {
 
     firstDayOfWeek: { def: -1 },
     showWeekNumber: { def: false },
+    calendarBackend: { def: "auto" },
     use24HourClock: { def: true },
     showSeconds: { def: false },
     padHours12Hour: { def: false },
@@ -156,6 +157,7 @@ var SPEC = {
     audioVisualizerEnabled: { def: true },
     audioScrollMode: { def: "volume" },
     audioWheelScrollAmount: { def: 5 },
+    audioDeviceScrollVolumeEnabled: { def: false },
     clockCompactMode: { def: false },
     focusedWindowCompactMode: { def: false },
     focusedWindowSize: { def: 1 },
@@ -163,6 +165,9 @@ var SPEC = {
     barMaxVisibleApps: { def: 0 },
     barMaxVisibleRunningApps: { def: 0 },
     barShowOverflowBadge: { def: true },
+    trayAutoOverflow: { def: true },
+    trayPopupSingleLine: { def: true },
+    trayMaxVisibleItems: { def: 0 },
     appsDockHideIndicators: { def: false },
     appsDockColorizeActive: { def: false },
     appsDockActiveColorMode: { def: "primary" },
@@ -260,9 +265,16 @@ var SPEC = {
     notepadUseMonospace: { def: true },
     notepadFontFamily: { def: "" },
     notepadFontSize: { def: 14 },
+    notificationSummaryFontSize: { def: 0 },
+    notificationBodyFontSize: { def: 0 },
     notepadShowLineNumbers: { def: false },
+    notepadAutoSave: { def: false },
+    notepadSlideoutSide: { def: "right" },
+    notepadDefaultMode: { def: "slideout" },
     notepadTransparencyOverride: { def: -1 },
     notepadLastCustomTransparency: { def: 0.7 },
+    notepadUseCompositorGap: { def: false },
+    notepadEdgeGap: { def: 0 },
 
     soundsEnabled: { def: true },
     useSystemSoundTheme: { def: false },
@@ -406,6 +418,7 @@ var SPEC = {
     notificationTimeoutNormal: { def: 5000 },
     notificationTimeoutCritical: { def: 0 },
     notificationCompactMode: { def: false },
+    notificationShowTimeoutBar: { def: false },
     notificationDedupeEnabled: { def: true },
     notificationPopupPosition: { def: 0 },
     notificationAnimationSpeed: { def: 1 },
@@ -569,6 +582,7 @@ var SPEC = {
 
     builtInPluginSettings: { def: {} },
     clipboardEnterToPaste: { def: false },
+    clipboardVisibleEntryActions: { def: ["pin", "edit", "delete"] },
 
     launcherPluginVisibility: { def: {} },
     launcherPluginOrder: { def: [] },

quickshell/DMSShell.qml

@@ -64,27 +64,15 @@ Item {
         }
     }
 
-    property bool wallpaperSurfacesLoaded: true
-
     Loader {
         id: blurredWallpaperBackgroundLoader
-        active: root.wallpaperSurfacesLoaded && SettingsData.blurredWallpaperLayer && CompositorService.isNiri
+        active: SettingsData.blurredWallpaperLayer && CompositorService.isNiri
         asynchronous: false
 
         sourceComponent: BlurredWallpaperBackground {}
     }
 
-    DeferredAction {
-        id: wallpaperSurfaceReloadAction
-        onTriggered: root.wallpaperSurfacesLoaded = true
-    }
-
-    Loader {
-        id: wallpaperBackgroundLoader
-        active: root.wallpaperSurfacesLoaded
-        asynchronous: false
-        sourceComponent: WallpaperBackground {}
-    }
+    WallpaperBackground {}
 
     DesktopWidgetLayer {}
 
@@ -398,11 +386,6 @@ Item {
                 frameSurfaceReloadAction.schedule();
             }
 
-            if (root.wallpaperSurfacesLoaded) {
-                root.wallpaperSurfacesLoaded = false;
-                wallpaperSurfaceReloadAction.schedule();
-            }
-
             root.dockEnabled = false;
             Qt.callLater(() => {
                 root.dockEnabled = true;
@@ -1110,11 +1093,22 @@ Item {
             slideoutWidth: 480
             expandable: true
             expandedWidthValue: 960
+            edgeGap: SettingsData.notepadEffectiveEdgeGap
+            slideEdge: SettingsData.notepadSlideoutSide
+
+            onIsVisibleChanged: {
+                if (isVisible)
+                    PopoutService.notepadPopout?.hide();
+            }
 
             content: Component {
                 Notepad {
                     slideout: notepadSlideout
                     onHideRequested: notepadSlideout.hide()
+                    onPopoutRequested: {
+                        notepadSlideout.hide();
+                        PopoutService.openNotepadPopout();
+                    }
                 }
             }
 
@@ -1131,6 +1125,24 @@ Item {
         Component.onCompleted: PopoutService.notepadSlideouts = instances
     }
 
+    LazyLoader {
+        id: notepadPopoutLoader
+        active: false
+
+        Component.onCompleted: {
+            PopoutService.notepadPopoutLoader = notepadPopoutLoader;
+        }
+
+        onActiveChanged: {
+            if (active && item) {
+                PopoutService.notepadPopout = item;
+                PopoutService._onNotepadPopoutLoaded();
+            }
+        }
+
+        NotepadPopoutWindow {}
+    }
+
     LazyLoader {
         id: powerMenuModalLoader
 

quickshell/DMSShellIPC.qml

@@ -337,9 +337,6 @@ Item {
                 const focusedWs = I3.workspaces.values.find(ws => ws.focused === true);
                 return focusedWs?.monitor?.name || "";
             }
-            if (CompositorService.isDwl && DwlService.activeOutput) {
-                return DwlService.activeOutput;
-            }
             if (CompositorService.isMango && MangoService.activeOutput) {
                 return MangoService.activeOutput;
             }
@@ -376,6 +373,10 @@ Item {
         }
 
         function open(): string {
+            if (SettingsData.notepadDefaultMode === "popout") {
+                PopoutService.openNotepadPopout();
+                return "NOTEPAD_OPEN_SUCCESS";
+            }
             var instance = getActiveNotepadInstance();
             if (instance) {
                 instance.show();
@@ -385,6 +386,10 @@ Item {
         }
 
         function close(): string {
+            if (SettingsData.notepadDefaultMode === "popout") {
+                PopoutService.notepadPopout?.hide();
+                return "NOTEPAD_CLOSE_SUCCESS";
+            }
             var instance = getActiveNotepadInstance();
             if (instance) {
                 instance.hide();
@@ -394,6 +399,10 @@ Item {
         }
 
         function toggle(): string {
+            if (SettingsData.notepadDefaultMode === "popout") {
+                PopoutService.toggleNotepadPopout();
+                return "NOTEPAD_TOGGLE_SUCCESS";
+            }
             var instance = getActiveNotepadInstance();
             if (instance) {
                 instance.toggle();
@@ -947,7 +956,7 @@ Item {
 
         function tabs(): string {
             if (!PopoutService.settingsModal)
-                return "wallpaper\ntheme\ntypography\ntime_weather\nsounds\ndankbar\ndankbar_settings\ndankbar_appearance\ndankbar_widgets\nframe\nworkspaces\ncompositor\nmedia_player\nnotifications\nosd\nrunning_apps\nupdater\ndock\nlauncher\nkeybinds\ndisplays\nnetwork\nprinters\nlock_screen\npower_sleep\nplugins\nabout";
+                return "wallpaper\ntheme\ntypography\ntime_weather\nsounds\ndankbar\ndankbar_settings\ndankbar_appearance\ndankbar_widgets\nframe\nworkspaces\ncompositor\nmedia_player\nnotifications\nosd\nrunning_apps\nupdater\ndock\nlauncher\nkeybinds\ndisplays\nnetwork\nnetwork_status\nnetwork_ethernet\nnetwork_wifi\nnetwork_vpn\nprinters\nlock_screen\npower_sleep\nplugins\nabout";
             var modal = PopoutService.settingsModal;
             var ids = [];
             var structure = modal.sidebar?.categoryStructure ?? [];

quickshell/Modals/Clipboard/ClipboardContent.qml

@@ -7,7 +7,6 @@ Item {
     id: clipboardContent
 
     required property var modal
-    required property var clearConfirmDialog
 
     property alias searchField: searchField
     property alias clipboardListView: clipboardListView
@@ -33,14 +32,7 @@ Item {
             pinnedCount: modal.pinnedCount
             onKeyboardHintsToggled: modal.showKeyboardHints = !modal.showKeyboardHints
             onTabChanged: tabName => modal.activeTab = tabName
-            onClearAllClicked: {
-                const hasPinned = modal.pinnedCount > 0;
-                const message = hasPinned ? I18n.tr("This will delete all unpinned entries. %1 pinned entries will be kept.").arg(modal.pinnedCount) : I18n.tr("This will permanently delete all clipboard history.");
-                clearConfirmDialog.show(I18n.tr("Clear History?"), message, function () {
-                    modal.clearAll();
-                    modal.hide();
-                }, function () {});
-            }
+            onClearAllClicked: modal.confirmClearAll()
             onCloseClicked: modal.hide()
         }
 
@@ -128,7 +120,7 @@ Item {
             }
 
             StyledText {
-                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No recent clipboard entries found") : I18n.tr("Connecting to clipboard service…")
+                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No recent clipboard entries found") : I18n.tr("Connecting to clipboard service...")
                 anchors.centerIn: parent
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText
@@ -149,8 +141,8 @@ Item {
                 listView: clipboardListView
                 onCopyRequested: clipboardContent.modal.copyEntry(modelData)
                 onDeleteRequested: clipboardContent.modal.deleteEntry(modelData)
-                onPinRequested: clipboardContent.modal.pinEntry(modelData)
-                onUnpinRequested: clipboardContent.modal.unpinEntry(modelData)
+                onPinRequested: targetEntry => clipboardContent.modal.pinEntry(targetEntry)
+                onUnpinRequested: targetEntry => clipboardContent.modal.unpinEntry(targetEntry)
                 onEditRequested: clipboardContent.modal.editEntry(modelData)
             }
         }
@@ -202,7 +194,7 @@ Item {
             }
 
             StyledText {
-                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No saved clipboard entries") : I18n.tr("Connecting to clipboard service…")
+                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No saved clipboard entries") : I18n.tr("Connecting to clipboard service...")
                 anchors.centerIn: parent
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText
@@ -223,8 +215,8 @@ Item {
                 listView: savedListView
                 onCopyRequested: clipboardContent.modal.copyEntry(modelData)
                 onDeleteRequested: clipboardContent.modal.deletePinnedEntry(modelData)
-                onPinRequested: clipboardContent.modal.pinEntry(modelData)
-                onUnpinRequested: clipboardContent.modal.unpinEntry(modelData)
+                onPinRequested: targetEntry => clipboardContent.modal.pinEntry(targetEntry)
+                onUnpinRequested: targetEntry => clipboardContent.modal.unpinEntry(targetEntry)
                 onEditRequested: clipboardContent.modal.editEntry(modelData)
             }
         }

quickshell/Modals/Clipboard/ClipboardEntry.qml

@@ -15,13 +15,21 @@ Rectangle {
 
     signal copyRequested
     signal deleteRequested
-    signal pinRequested
-    signal unpinRequested
+    signal pinRequested(var targetEntry)
+    signal unpinRequested(var targetEntry)
     signal editRequested
 
     readonly property string entryType: modal ? modal.getEntryType(entry) : "text"
     readonly property string entryPreview: modal ? modal.getEntryPreview(entry) : ""
-    readonly property bool hasPinnedDuplicate: !entry.pinned && ClipboardService.hashedPinnedEntry(entry.hash)
+    readonly property var pinnedDuplicateEntry: !entry.pinned ? ClipboardService.getPinnedEntryByHash(entry.hash) : null
+    readonly property bool hasPinnedDuplicate: pinnedDuplicateEntry !== null
+    readonly property bool effectivePinned: entry.pinned || hasPinnedDuplicate
+    readonly property var visibleEntryActions: SettingsData.clipboardVisibleEntryActions || ["pin", "edit", "delete"]
+    readonly property bool showPinAction: visibleEntryActions.includes("pin")
+    readonly property bool showEditAction: visibleEntryActions.includes("edit")
+    readonly property bool showDeleteAction: visibleEntryActions.includes("delete")
+    readonly property bool showPinnedIndicator: hasPinnedDuplicate && !showPinAction
+    readonly property bool showAnyAction: showPinAction || showEditAction || showDeleteAction || showPinnedIndicator
 
     radius: Theme.cornerRadius
     color: {
@@ -62,19 +70,46 @@ Rectangle {
         anchors.rightMargin: Theme.spacingS
         anchors.verticalCenter: parent.verticalCenter
         spacing: Theme.spacingXS
+        visible: root.showAnyAction
+
+        Item {
+            width: 40
+            height: 40
+            visible: root.showPinnedIndicator
+
+            // Status indicator only; the Pin action remains hidden.
+            DankIcon {
+                anchors.centerIn: parent
+                name: "push_pin"
+                size: Theme.iconSize - 6
+                color: Theme.primary
+            }
+        }
 
         DankActionButton {
             iconName: "push_pin"
             iconSize: Theme.iconSize - 6
             iconColor: (entry.pinned || hasPinnedDuplicate) ? Theme.primary : Theme.surfaceText
             backgroundColor: (entry.pinned || hasPinnedDuplicate) ? Theme.primarySelected : "transparent"
-            onClicked: entry.pinned ? unpinRequested() : pinRequested()
+            visible: root.showPinAction
+            onClicked: {
+                if (entry.pinned) {
+                    unpinRequested(entry);
+                    return;
+                }
+                if (pinnedDuplicateEntry) {
+                    unpinRequested(pinnedDuplicateEntry);
+                    return;
+                }
+                pinRequested(entry);
+            }
         }
 
         DankActionButton {
             iconName: "edit"
             iconSize: Theme.iconSize - 6
             iconColor: Theme.surfaceText
+            visible: root.showEditAction
 
             onClicked: {
                 if (entryType === "image") {
@@ -88,6 +123,7 @@ Rectangle {
             iconName: "close"
             iconSize: Theme.iconSize - 6
             iconColor: Theme.surfaceText
+            visible: root.showDeleteAction
             onClicked: deleteRequested()
         }
     }
@@ -95,8 +131,8 @@ Rectangle {
     Item {
         anchors.left: indexBadge.right
         anchors.leftMargin: Theme.spacingM
-        anchors.right: actionButtons.left
-        anchors.rightMargin: Theme.spacingM
+        anchors.right: root.showAnyAction ? actionButtons.left : parent.right
+        anchors.rightMargin: root.showAnyAction ? Theme.spacingM : Theme.spacingS
         anchors.verticalCenter: parent.verticalCenter
         // height: contentColumn.implicitHeight
         height: ClipboardConstants.itemHeight
@@ -157,8 +193,8 @@ Rectangle {
     MouseArea {
         id: mouseArea
         anchors.left: parent.left
-        anchors.right: actionButtons.left
-        anchors.rightMargin: Theme.spacingS
+        anchors.right: root.showAnyAction ? actionButtons.left : parent.right
+        anchors.rightMargin: root.showAnyAction ? Theme.spacingS : 0
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         hoverEnabled: true

quickshell/Modals/Clipboard/ClipboardHistoryContent.qml

@@ -82,6 +82,15 @@ FocusScope {
         ClipboardService.clearAll();
     }
 
+    function confirmClearAll() {
+        const hasPinned = pinnedCount > 0;
+        const message = hasPinned ? I18n.tr("This will delete all unpinned entries. %1 pinned entries will be kept.").arg(pinnedCount) : I18n.tr("This will permanently delete all clipboard history.");
+        clearConfirmDialog.show(I18n.tr("Clear History?"), message, function () {
+            clearAll();
+            hide();
+        }, function () {});
+    }
+
     function getEntryPreview(entry) {
         return ClipboardService.getEntryPreview(entry);
     }
@@ -135,7 +144,6 @@ FocusScope {
             id: historyContent
             anchors.fill: parent
             modal: root
-            clearConfirmDialog: root.clearConfirmDialog
         }
     }
 

quickshell/Modals/Clipboard/ClipboardHistoryModal.qml

@@ -58,6 +58,7 @@ DankModal {
     readonly property bool clipboardAvailable: ClipboardService.clipboardAvailable
 
     visible: false
+    keepContentLoaded: true
     modalWidth: ClipboardConstants.modalWidth
     modalHeight: ClipboardConstants.modalHeight
     backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
@@ -76,22 +77,35 @@ DankModal {
         id: clearConfirmDialog
         confirmButtonText: I18n.tr("Clear All")
         confirmButtonColor: Theme.primary
-        onVisibleChanged: {
-            if (visible) {
+        onShouldBeVisibleChanged: {
+            if (shouldBeVisible) {
                 clipboardHistoryModal.shouldHaveFocus = false;
+                selectedButton = 0;
+                keyboardNavigation = true;
                 return;
             }
             Qt.callLater(function () {
                 if (!clipboardHistoryModal.shouldBeVisible) {
                     return;
                 }
-                clipboardHistoryModal.shouldHaveFocus = true;
+                clipboardHistoryModal.shouldHaveFocus = Qt.binding(() => clipboardHistoryModal.shouldBeVisible);
                 clipboardHistoryModal.modalFocusScope.forceActiveFocus();
                 if (clipboardHistoryModal.contentLoader.item?.searchField) {
                     clipboardHistoryModal.contentLoader.item.searchField.forceActiveFocus();
                 }
             });
         }
+        Connections {
+            target: clearConfirmDialog.modalFocusScope.Keys
+            function onPressed(event) {
+                if (!clearConfirmDialog.shouldBeVisible || event.key !== Qt.Key_Backtab) {
+                    return;
+                }
+                clearConfirmDialog.selectedButton = clearConfirmDialog.selectedButton === -1 ? 1 : (clearConfirmDialog.selectedButton - 1 + 2) % 2;
+                clearConfirmDialog.keyboardNavigation = true;
+                event.accepted = true;
+            }
+        }
     }
 
     content: Component {

quickshell/Modals/Clipboard/ClipboardHistoryPopout.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import Quickshell.Wayland
 import qs.Common
 import qs.Modals.Clipboard
 import qs.Modals.Common
@@ -95,6 +96,35 @@ DankPopout {
         id: clearConfirmDialog
         confirmButtonText: I18n.tr("Clear All")
         confirmButtonColor: Theme.primary
+        onShouldBeVisibleChanged: {
+            if (shouldBeVisible) {
+                root.customKeyboardFocus = WlrKeyboardFocus.None;
+                selectedButton = 0;
+                keyboardNavigation = true;
+                return;
+            }
+            root.customKeyboardFocus = null;
+            Qt.callLater(function () {
+                if (!root.shouldBeVisible || !root.contentLoader.item) {
+                    return;
+                }
+                root.contentLoader.item.forceActiveFocus();
+                if (root.contentLoader.item.searchField) {
+                    root.contentLoader.item.searchField.forceActiveFocus();
+                }
+            });
+        }
+        Connections {
+            target: clearConfirmDialog.modalFocusScope.Keys
+            function onPressed(event) {
+                if (!clearConfirmDialog.shouldBeVisible || event.key !== Qt.Key_Backtab) {
+                    return;
+                }
+                clearConfirmDialog.selectedButton = clearConfirmDialog.selectedButton === -1 ? 1 : (clearConfirmDialog.selectedButton - 1 + 2) % 2;
+                clearConfirmDialog.keyboardNavigation = true;
+                event.accepted = true;
+            }
+        }
     }
 
     content: Component {

quickshell/Modals/Clipboard/ClipboardKeyboardController.qml

@@ -59,8 +59,13 @@ QtObject {
             return;
         }
         const selectedEntry = entries[ClipboardService.selectedIndex];
-        if (modal.activeTab === "saved") {
+        if (selectedEntry.pinned) {
             modal.unpinEntry(selectedEntry);
+            return;
+        }
+        const pinnedDuplicate = ClipboardService.getPinnedEntryByHash(selectedEntry.hash);
+        if (pinnedDuplicate) {
+            modal.unpinEntry(pinnedDuplicate);
         } else {
             modal.pinEntry(selectedEntry);
         }
@@ -120,8 +125,6 @@ QtObject {
             if (!ClipboardService.keyboardNavigationActive) {
                 ClipboardService.keyboardNavigationActive = true;
                 ClipboardService.selectedIndex = 0;
-            } else if (ClipboardService.selectedIndex === 0) {
-                ClipboardService.keyboardNavigationActive = false;
             } else {
                 selectPrevious();
             }
@@ -150,8 +153,6 @@ QtObject {
                 if (!ClipboardService.keyboardNavigationActive) {
                     ClipboardService.keyboardNavigationActive = true;
                     ClipboardService.selectedIndex = 0;
-                } else if (ClipboardService.selectedIndex === 0) {
-                    ClipboardService.keyboardNavigationActive = false;
                 } else {
                     selectPrevious();
                 }
@@ -179,8 +180,7 @@ QtObject {
         if (event.modifiers & Qt.ShiftModifier) {
             switch (event.key) {
             case Qt.Key_Delete:
-                modal.clearAll();
-                modal.hide();
+                modal.confirmClearAll();
                 event.accepted = true;
                 return;
             case Qt.Key_Return:

quickshell/Modals/Common/DankModal.qml

@@ -54,23 +54,12 @@ Item {
         anchors.fill: parent
     }
 
-    // One focus grab for every modal; on Hyprland this is what delivers
-    // keyboard focus to the OnDemand surface, identically in both modes.
-    // The clickCatcher is whitelisted so an outside click is delivered to
-    // it (closing the modal) instead of being consumed clearing the grab.
+    // Hyprland OnDemand grab delivers keyboard focus to the modal content surface.
     HyprlandFocusGrab {
-        windows: {
-            const list = [];
-            if (root.contentWindow)
-                list.push(root.contentWindow);
-            if (root.clickCatcher)
-                list.push(root.clickCatcher);
-            return list;
-        }
+        windows: root.contentWindow ? [root.contentWindow] : []
         active: KeyboardFocus.wantsGrab(root.shouldHaveFocus, root.customKeyboardFocus)
     }
     readonly property var contentWindow: impl.item ? impl.item.contentWindow : null
-    readonly property var clickCatcher: impl.item ? impl.item.clickCatcher : null
     readonly property var effectiveScreen: impl.item ? impl.item.effectiveScreen : null
     readonly property real screenWidth: impl.item ? impl.item.screenWidth : 1920
     readonly property real screenHeight: impl.item ? impl.item.screenHeight : 1080
@@ -113,8 +102,6 @@ Item {
         }
     }
 
-    // Defer Loader source-component swap until impl is fully closed; avoids
-    // tearing down a modal mid-animation when frame mode is toggled.
     function _maybeResolveBackend() {
         if (_resolvedBackend === _desiredBackend)
             return;

quickshell/Modals/Common/DankModalConnected.qml

@@ -31,7 +31,6 @@ Item {
     property bool closeOnBackgroundClick: true
     property string animationType: "scale"
 
-    // Opposite side from the launcher by default; subclasses may override
     property string preferredConnectedBarSide: SettingsData.frameModalEmergeSide
 
     readonly property bool frameConnectedMode: SettingsData.frameEnabled && Theme.isConnectedEffect && !!effectiveScreen && SettingsData.isScreenInPreferences(effectiveScreen, SettingsData.frameScreenPreferences)
@@ -87,16 +86,13 @@ Item {
     property real frozenMotionOffsetX: 0
     property real frozenMotionOffsetY: 0
     readonly property alias contentWindow: contentWindow
-    readonly property alias clickCatcher: clickCatcher
     readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
     readonly property bool useBackground: false
-    readonly property bool useSingleWindow: CompositorService.isHyprland
 
     signal opened
     signal dialogClosed
     signal backgroundClicked
 
-    // Coalesce per-channel dirty bits; one ConnectedModeState write per tick.
     Timer {
         id: _syncTimer
         interval: 0
@@ -244,22 +240,16 @@ Item {
         const focusedScreen = CompositorService.getFocusedScreen();
         if (focusedScreen) {
             contentWindow.screen = focusedScreen;
-            if (!useSingleWindow)
-                clickCatcher.screen = focusedScreen;
         }
 
         ModalManager.openModal(modalHandle);
         if (Theme.isDirectionalEffect || root.useBackground) {
-            if (!useSingleWindow)
-                clickCatcher.visible = true;
             contentWindow.visible = true;
         }
 
         Qt.callLater(() => {
             animationsEnabled = true;
             shouldBeVisible = true;
-            if (!useSingleWindow && !clickCatcher.visible)
-                clickCatcher.visible = true;
             if (!contentWindow.visible)
                 contentWindow.visible = true;
             opened();
@@ -286,8 +276,6 @@ Item {
         ModalManager.closeModal(modalHandle);
         closeTimer.stop();
         contentWindow.visible = false;
-        if (!useSingleWindow)
-            clickCatcher.visible = false;
         dialogClosed();
         Qt.callLater(() => animationsEnabled = true);
     }
@@ -326,8 +314,6 @@ Item {
             const newScreen = CompositorService.getFocusedScreen();
             if (newScreen) {
                 contentWindow.screen = newScreen;
-                if (!useSingleWindow)
-                    clickCatcher.screen = newScreen;
             }
         }
     }
@@ -339,29 +325,12 @@ Item {
             if (shouldBeVisible)
                 return;
             contentWindow.visible = false;
-            if (!useSingleWindow)
-                clickCatcher.visible = false;
             dialogClosed();
         }
     }
 
-    // shadowRenderPadding is zeroed when frame owns the chrome
-    // Wayland then clips any content translating past
     readonly property var shadowLevel: Theme.elevationLevel3
     readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (!frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowMotionPadding: {
-        if (frameOwnsConnectedChrome)
-            return 0;
-        if (animationType === "slide")
-            return 30;
-        if (Theme.isDirectionalEffect)
-            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.9);
-        if (Theme.isDepthEffect)
-            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.35);
-        return Math.max(0, animationOffset);
-    }
-    readonly property real shadowBuffer: Theme.snap(shadowRenderPadding + shadowMotionPadding, dpr)
     readonly property real alignedWidth: Theme.px(modalWidth, dpr)
     readonly property real alignedHeight: Theme.px(modalHeight, dpr)
 
@@ -371,7 +340,6 @@ Item {
         return SettingsData.frameEdgeInsetForSide(effectiveScreen, side);
     }
 
-    // frameEdgeInsetForSide is the full inset; do not add frameBarSize
     readonly property real _connectedAlignedX: {
         switch (resolvedConnectedBarSide) {
         case "top":
@@ -434,57 +402,6 @@ Item {
             }
         })(), dpr)
 
-    PanelWindow {
-        id: clickCatcher
-        visible: false
-        color: "transparent"
-
-        WlrLayershell.namespace: root.layerNamespace + ":clickcatcher"
-        WlrLayershell.layer: WlrLayershell.Top
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        anchors {
-            top: true
-            left: true
-            right: true
-            bottom: true
-        }
-
-        mask: Region {
-            item: Rectangle {
-                x: root.alignedX
-                y: root.alignedY
-                width: root.alignedWidth
-                height: root.alignedHeight
-            }
-            intersection: Intersection.Xor
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: !root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
-            onClicked: root.backgroundClicked()
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            z: -1
-            color: "black"
-            opacity: (!root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: opacity > 0
-
-            Behavior on opacity {
-                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                NumberAnimation {
-                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                }
-            }
-        }
-    }
-
     PanelWindow {
         id: contentWindow
         visible: false
@@ -494,8 +411,8 @@ Item {
             targetWindow: contentWindow
             blurEnabled: root.effectiveBlurEnabled && !root.frameOwnsConnectedChrome
             readonly property real s: Math.min(1, modalContainer.scaleValue)
-            blurX: modalContainer.x + modalContainer.width * (1 - s) * 0.5 + Theme.snap(modalContainer.animX, root.dpr)
-            blurY: modalContainer.y + modalContainer.height * (1 - s) * 0.5 + Theme.snap(modalContainer.animY, root.dpr)
+            blurX: connectedReveal.x + modalContainer.x + modalContainer.width * (1 - s) * 0.5 + Theme.snap(modalContainer.animX, root.dpr)
+            blurY: connectedReveal.y + modalContainer.y + modalContainer.height * (1 - s) * 0.5 + Theme.snap(modalContainer.animY, root.dpr)
             blurWidth: (root.shouldBeVisible && !root.frameOwnsConnectedChrome) ? modalContainer.width * s : 0
             blurHeight: (root.shouldBeVisible && !root.frameOwnsConnectedChrome) ? modalContainer.height * s : 0
             blurRadius: root.effectiveCornerRadius
@@ -514,23 +431,10 @@ Item {
         anchors {
             left: true
             top: true
-            right: root.useSingleWindow
-            bottom: root.useSingleWindow
+            right: true
+            bottom: true
         }
 
-        readonly property real actualMarginLeft: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr))
-        readonly property real actualMarginTop: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr))
-
-        WlrLayershell.margins {
-            left: actualMarginLeft
-            top: actualMarginTop
-            right: 0
-            bottom: 0
-        }
-
-        implicitWidth: root.useSingleWindow ? 0 : root.alignedWidth + (shadowBuffer * 2)
-        implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2)
-
         onVisibleChanged: {
             if (visible)
                 return;
@@ -542,7 +446,7 @@ Item {
 
         MouseArea {
             anchors.fill: parent
-            enabled: root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
+            enabled: root.closeOnBackgroundClick && root.shouldBeVisible
             z: -2
             onClicked: root.backgroundClicked()
         }
@@ -551,7 +455,7 @@ Item {
             anchors.fill: parent
             z: -1
             color: "black"
-            opacity: (root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
+            opacity: root.useBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
             visible: opacity > 0
 
             Behavior on opacity {
@@ -565,249 +469,256 @@ Item {
         }
 
         Item {
-            id: modalContainer
-            x: (root.useSingleWindow ? root.alignedX : (root.alignedX - contentWindow.actualMarginLeft)) + Theme.snap(animX, root.dpr)
-            y: (root.useSingleWindow ? root.alignedY : (root.alignedY - contentWindow.actualMarginTop)) + Theme.snap(animY, root.dpr)
-
+            id: connectedReveal
+            // Clip to final footprint while frame-owned chrome grows from the bar edge.
+            x: root.alignedX
+            y: root.alignedY
             width: root.alignedWidth
             height: root.alignedHeight
-
-            MouseArea {
-                anchors.fill: parent
-                enabled: root.useSingleWindow && root.shouldBeVisible
-                hoverEnabled: false
-                acceptedButtons: Qt.AllButtons
-                onPressed: mouse.accepted = true
-                onClicked: mouse.accepted = true
-                z: -1
-            }
-
-            readonly property bool slide: root.animationType === "slide"
-            readonly property bool directionalEffect: Theme.isDirectionalEffect
-            readonly property bool depthEffect: Theme.isDepthEffect
-            readonly property real directionalTravel: Math.max(root.animationOffset, Math.max(root.alignedWidth, root.alignedHeight) * 0.8)
-            readonly property real depthTravel: Math.max(root.animationOffset * 0.8, 36)
-            readonly property real customAnchorX: root.alignedX + root.alignedWidth * 0.5
-            readonly property real customAnchorY: root.alignedY + root.alignedHeight * 0.5
-            readonly property real customDistLeft: customAnchorX
-            readonly property real customDistRight: root.screenWidth - customAnchorX
-            readonly property real customDistTop: customAnchorY
-            readonly property real customDistBottom: root.screenHeight - customAnchorY
-            // Connected emergence: travel from the resolved bar edge, matching DankPopout cadence.
-            readonly property real connectedEmergenceTravelX: Math.max(root.animationOffset, root.alignedWidth + Theme.spacingL)
-            readonly property real connectedEmergenceTravelY: Math.max(root.animationOffset, root.alignedHeight + Theme.spacingL)
-            readonly property real offsetX: {
-                if (root.frameOwnsConnectedChrome) {
-                    switch (root.resolvedConnectedBarSide) {
-                    case "left":
-                        return -connectedEmergenceTravelX;
-                    case "right":
-                        return connectedEmergenceTravelX;
-                    }
-                    return 0;
-                }
-                if (slide && !directionalEffect && !depthEffect)
-                    return 15;
-                if (directionalEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return 0;
-                    case "custom":
-                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
-                            return -directionalTravel;
-                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
-                            return directionalTravel;
-                        return 0;
-                    default:
-                        return 0;
-                    }
-                }
-                if (depthEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return 0;
-                    case "custom":
-                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
-                            return -depthTravel;
-                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
-                            return depthTravel;
-                        return 0;
-                    default:
-                        return 0;
-                    }
-                }
-                return 0;
-            }
-            readonly property real offsetY: {
-                if (root.frameOwnsConnectedChrome) {
-                    switch (root.resolvedConnectedBarSide) {
-                    case "top":
-                        return -connectedEmergenceTravelY;
-                    case "bottom":
-                        return connectedEmergenceTravelY;
-                    }
-                    return 0;
-                }
-                if (slide && !directionalEffect && !depthEffect)
-                    return -30;
-                if (directionalEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return -Math.max(directionalTravel * 0.65, 96);
-                    case "custom":
-                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
-                            return -directionalTravel;
-                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
-                            return directionalTravel;
-                        return 0;
-                    default:
-                        // Default to sliding down from top when centered
-                        return -Math.max(directionalTravel, root.screenHeight * 0.24);
-                    }
-                }
-                if (depthEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return -depthTravel * 0.75;
-                    case "custom":
-                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
-                            return -depthTravel;
-                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
-                            return depthTravel;
-                        return depthTravel * 0.45;
-                    default:
-                        return -depthTravel;
-                    }
-                }
-                return root.animationOffset;
-            }
-
-            readonly property real computedScaleCollapsed: root.animationScaleCollapsed
-
-            // openProgress: 0 = closed (at frozenMotionOffset, scaleCollapsed), 1 = open (at 0, scale 1).
-            QtObject {
-                id: morph
-                property real openProgress: root.shouldBeVisible ? 1 : 0
-                Behavior on openProgress {
-                    enabled: root.animationsEnabled
-                    NumberAnimation {
-                        duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                    }
-                }
-            }
-
-            readonly property real animX: root.frozenMotionOffsetX * (1 - morph.openProgress)
-            readonly property real animY: root.frozenMotionOffsetY * (1 - morph.openProgress)
-            readonly property real scaleValue: computedScaleCollapsed + (1.0 - computedScaleCollapsed) * morph.openProgress
-
-            onAnimXChanged: if (root.frameOwnsConnectedChrome)
-                root._queueAnimSync()
-            onAnimYChanged: if (root.frameOwnsConnectedChrome)
-                root._queueAnimSync()
+            clip: root.frameOwnsConnectedChrome
 
             Item {
-                id: contentContainer
-                anchors.centerIn: parent
-                width: parent.width
-                height: parent.height
-                clip: false
+                id: modalContainer
+                x: Theme.snap(animX, root.dpr)
+                y: Theme.snap(animY, root.dpr)
+
+                width: root.alignedWidth
+                height: root.alignedHeight
+
+                MouseArea {
+                    anchors.fill: parent
+                    enabled: root.shouldBeVisible
+                    hoverEnabled: false
+                    acceptedButtons: Qt.AllButtons
+                    onPressed: mouse.accepted = true
+                    onClicked: mouse.accepted = true
+                    z: -1
+                }
+
+                readonly property bool slide: root.animationType === "slide"
+                readonly property bool directionalEffect: Theme.isDirectionalEffect
+                readonly property bool depthEffect: Theme.isDepthEffect
+                readonly property real directionalTravel: Math.max(root.animationOffset, Math.max(root.alignedWidth, root.alignedHeight) * 0.8)
+                readonly property real depthTravel: Math.max(root.animationOffset * 0.8, 36)
+                readonly property real customAnchorX: root.alignedX + root.alignedWidth * 0.5
+                readonly property real customAnchorY: root.alignedY + root.alignedHeight * 0.5
+                readonly property real customDistLeft: customAnchorX
+                readonly property real customDistRight: root.screenWidth - customAnchorX
+                readonly property real customDistTop: customAnchorY
+                readonly property real customDistBottom: root.screenHeight - customAnchorY
+                readonly property real connectedEmergenceTravelX: Math.max(root.animationOffset, root.alignedWidth + Theme.spacingL)
+                readonly property real connectedEmergenceTravelY: Math.max(root.animationOffset, root.alignedHeight + Theme.spacingL)
+                readonly property real offsetX: {
+                    if (root.frameOwnsConnectedChrome) {
+                        switch (root.resolvedConnectedBarSide) {
+                        case "left":
+                            return -connectedEmergenceTravelX;
+                        case "right":
+                            return connectedEmergenceTravelX;
+                        }
+                        return 0;
+                    }
+                    if (slide && !directionalEffect && !depthEffect)
+                        return 15;
+                    if (directionalEffect) {
+                        switch (root.positioning) {
+                        case "top-right":
+                            return 0;
+                        case "custom":
+                            if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
+                                return -directionalTravel;
+                            if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
+                                return directionalTravel;
+                            return 0;
+                        default:
+                            return 0;
+                        }
+                    }
+                    if (depthEffect) {
+                        switch (root.positioning) {
+                        case "top-right":
+                            return 0;
+                        case "custom":
+                            if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
+                                return -depthTravel;
+                            if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
+                                return depthTravel;
+                            return 0;
+                        default:
+                            return 0;
+                        }
+                    }
+                    return 0;
+                }
+                readonly property real offsetY: {
+                    if (root.frameOwnsConnectedChrome) {
+                        switch (root.resolvedConnectedBarSide) {
+                        case "top":
+                            return -connectedEmergenceTravelY;
+                        case "bottom":
+                            return connectedEmergenceTravelY;
+                        }
+                        return 0;
+                    }
+                    if (slide && !directionalEffect && !depthEffect)
+                        return -30;
+                    if (directionalEffect) {
+                        switch (root.positioning) {
+                        case "top-right":
+                            return -Math.max(directionalTravel * 0.65, 96);
+                        case "custom":
+                            if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
+                                return -directionalTravel;
+                            if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
+                                return directionalTravel;
+                            return 0;
+                        default:
+                            return -Math.max(directionalTravel, root.screenHeight * 0.24);
+                        }
+                    }
+                    if (depthEffect) {
+                        switch (root.positioning) {
+                        case "top-right":
+                            return -depthTravel * 0.75;
+                        case "custom":
+                            if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
+                                return -depthTravel;
+                            if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
+                                return depthTravel;
+                            return depthTravel * 0.45;
+                        default:
+                            return -depthTravel;
+                        }
+                    }
+                    return root.animationOffset;
+                }
+
+                readonly property real computedScaleCollapsed: root.animationScaleCollapsed
+
+                QtObject {
+                    id: morph
+                    property real openProgress: root.shouldBeVisible ? 1 : 0
+                    Behavior on openProgress {
+                        enabled: root.animationsEnabled
+                        NumberAnimation {
+                            duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
+                            easing.type: Easing.BezierSpline
+                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                        }
+                    }
+                }
+
+                readonly property real animX: root.frozenMotionOffsetX * (1 - morph.openProgress)
+                readonly property real animY: root.frozenMotionOffsetY * (1 - morph.openProgress)
+                readonly property real scaleValue: computedScaleCollapsed + (1.0 - computedScaleCollapsed) * morph.openProgress
+
+                onAnimXChanged: if (root.frameOwnsConnectedChrome)
+                    root._queueAnimSync()
+                onAnimYChanged: if (root.frameOwnsConnectedChrome)
+                    root._queueAnimSync()
 
                 Item {
-                    id: animatedContent
-                    anchors.fill: parent
+                    id: contentContainer
+                    anchors.centerIn: parent
+                    width: parent.width
+                    height: parent.height
                     clip: false
 
-                    property real publishedOpacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
-
-                    opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
-                    scale: modalContainer.scaleValue
-                    transformOrigin: Item.Center
-
-                    Behavior on opacity {
-                        enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                        NumberAnimation {
-                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                            easing.type: Easing.BezierSpline
-                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                        }
-                    }
-
-                    Behavior on publishedOpacity {
-                        enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                        NumberAnimation {
-                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                            easing.type: Easing.BezierSpline
-                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                        }
-                    }
-
-                    ElevationShadow {
-                        id: modalShadowLayer
+                    Item {
+                        id: animatedContent
                         anchors.fill: parent
-                        level: root.shadowLevel
-                        fallbackOffset: root.shadowFallbackOffset
-                        targetRadius: root.effectiveCornerRadius
-                        targetColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBackgroundColor
-                        borderColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBorderColor
-                        borderWidth: root.frameOwnsConnectedChrome ? 0 : root.effectiveBorderWidth
-                        shadowEnabled: !root.frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        radius: root.effectiveCornerRadius
-                        color: "transparent"
-                        border.color: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? "transparent" : BlurService.borderColor
-                        border.width: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? 0 : BlurService.borderWidth
-                        z: 100
-                    }
-
-                    FocusScope {
-                        anchors.fill: parent
-                        focus: root.shouldBeVisible
                         clip: false
 
-                        Item {
-                            id: directContentWrapper
+                        property real publishedOpacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
+
+                        opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
+                        scale: modalContainer.scaleValue
+                        transformOrigin: Item.Center
+
+                        Behavior on opacity {
+                            enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                            NumberAnimation {
+                                duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                                easing.type: Easing.BezierSpline
+                                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                            }
+                        }
+
+                        Behavior on publishedOpacity {
+                            enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                            NumberAnimation {
+                                duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                                easing.type: Easing.BezierSpline
+                                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                            }
+                        }
+
+                        ElevationShadow {
+                            id: modalShadowLayer
                             anchors.fill: parent
-                            visible: root.directContent !== null
-                            focus: true
+                            level: root.shadowLevel
+                            fallbackOffset: root.shadowFallbackOffset
+                            targetRadius: root.effectiveCornerRadius
+                            targetColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBackgroundColor
+                            borderColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBorderColor
+                            borderWidth: root.frameOwnsConnectedChrome ? 0 : root.effectiveBorderWidth
+                            shadowEnabled: !root.frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
+                        }
+
+                        Rectangle {
+                            anchors.fill: parent
+                            radius: root.effectiveCornerRadius
+                            color: "transparent"
+                            border.color: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? "transparent" : BlurService.borderColor
+                            border.width: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? 0 : BlurService.borderWidth
+                            z: 100
+                        }
+
+                        FocusScope {
+                            anchors.fill: parent
+                            focus: root.shouldBeVisible
                             clip: false
 
-                            Component.onCompleted: {
-                                if (root.directContent) {
-                                    root.directContent.parent = directContentWrapper;
-                                    root.directContent.anchors.fill = directContentWrapper;
-                                    Qt.callLater(() => root.directContent.forceActiveFocus());
-                                }
-                            }
+                            Item {
+                                id: directContentWrapper
+                                anchors.fill: parent
+                                visible: root.directContent !== null
+                                focus: true
+                                clip: false
 
-                            Connections {
-                                target: root
-                                function onDirectContentChanged() {
+                                Component.onCompleted: {
                                     if (root.directContent) {
                                         root.directContent.parent = directContentWrapper;
                                         root.directContent.anchors.fill = directContentWrapper;
                                         Qt.callLater(() => root.directContent.forceActiveFocus());
                                     }
                                 }
+
+                                Connections {
+                                    target: root
+                                    function onDirectContentChanged() {
+                                        if (root.directContent) {
+                                            root.directContent.parent = directContentWrapper;
+                                            root.directContent.anchors.fill = directContentWrapper;
+                                            Qt.callLater(() => root.directContent.forceActiveFocus());
+                                        }
+                                    }
+                                }
                             }
-                        }
 
-                        Loader {
-                            id: contentLoader
-                            anchors.fill: parent
-                            active: root.directContent === null && (root.keepContentLoaded || root.shouldBeVisible || contentWindow.visible)
-                            asynchronous: false
-                            focus: true
-                            clip: false
-                            visible: root.directContent === null
+                            Loader {
+                                id: contentLoader
+                                anchors.fill: parent
+                                active: root.directContent === null && (root.keepContentLoaded || root.shouldBeVisible || contentWindow.visible)
+                                asynchronous: false
+                                focus: true
+                                clip: false
+                                visible: root.directContent === null
 
-                            onLoaded: {
-                                if (item) {
-                                    Qt.callLater(() => item.forceActiveFocus());
+                                onLoaded: {
+                                    if (item) {
+                                        Qt.callLater(() => item.forceActiveFocus());
+                                    }
                                 }
                             }
                         }

quickshell/Modals/Common/DankModalStandalone.qml

@@ -205,6 +205,7 @@ Item {
         id: clickCatcher
         visible: false
         color: "transparent"
+        updatesEnabled: false
 
         WlrLayershell.namespace: root.layerNamespace + ":clickcatcher"
         WlrLayershell.layer: WlrLayershell.Top

quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml

@@ -30,7 +30,6 @@ Item {
     property string _pendingMode: ""
     readonly property bool unloadContentOnClose: SettingsData.dankLauncherV2UnloadOnClose
 
-    // Animation state — matches DankPopout/DankModal pattern
     property bool animationsEnabled: true
     property bool _motionActive: false
     property real _frozenMotionX: 0
@@ -108,8 +107,6 @@ Item {
         return SettingsData.frameEdgeInsetForSide(effectiveScreen, side);
     }
 
-    // frameEdgeInsetForSide is the full inset; do not add frameBarSize.
-    // Positions the modal flush to the emerge side, centered on the cross axis.
     readonly property var _connectedModalPos: {
         const fallback = {
             "x": (screenWidth - modalWidth) / 2,
@@ -175,8 +172,6 @@ Item {
     readonly property int effectiveBorderWidth: connectedSurfaceOverride ? 0 : borderWidth
     readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
 
-    // Shadow padding for the content window (render padding only, no motion padding).
-    // Zeroed when frame owns the chrome and Wayland clips past the bar edge
     readonly property var shadowLevel: Theme.elevationLevel3
     readonly property real shadowFallbackOffset: 6
     readonly property real shadowRenderPadding: (!frameOwnsConnectedChrome && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
@@ -203,29 +198,11 @@ Item {
     }
     readonly property real contentSurfaceHeight: launcherArcExtenderActive ? _connectedChromeHeight : alignedHeight
 
-    // For directional/depth: window extends from screen top (content slides within)
-    // For standard: small window tightly around the modal + shadow padding
-    readonly property bool _needsExtendedWindow: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) || Theme.isDepthEffect
-    // Content window geometry
-    readonly property real _cwMarginLeft: Theme.snap(alignedX - shadowPad, dpr)
-    readonly property real _cwMarginTop: launcherArcExtenderActive ? _connectedChromeY : (_needsExtendedWindow ? 0 : Theme.snap(alignedY - shadowPad, dpr))
-    readonly property real _cwWidth: alignedWidth + shadowPad * 2
-    readonly property real _cwHeight: {
-        if (launcherArcExtenderActive)
-            return _connectedChromeHeight;
-        if (Theme.isDirectionalEffect && !Theme.isConnectedEffect)
-            return screenHeight + shadowPad;
-        if (Theme.isDepthEffect)
-            return alignedY + alignedHeight + shadowPad;
-        return alignedHeight + shadowPad * 2;
-    }
-    // Where the content container sits inside the content window
-    readonly property real _ccX: shadowPad
-    readonly property real _ccY: launcherArcExtenderActive ? 0 : (_needsExtendedWindow ? alignedY : shadowPad)
+    readonly property real _ccX: _connectedChromeX
+    readonly property real _ccY: _connectedChromeY
 
     signal dialogClosed
 
-    // Coalesce per-channel dirty bits; one ConnectedModeState write per tick.
     Timer {
         id: _syncTimer
         interval: 0
@@ -381,8 +358,6 @@ Item {
             return;
         contentVisible = true;
         spotlightContent.closeTransientUi?.();
-        // NOTE: forceActiveFocus() is deliberately NOT called here.
-        // It is deferred to after animation starts to avoid compositor IPC stalls.
 
         if (spotlightContent.searchField) {
             spotlightContent.searchField.text = query;
@@ -420,38 +395,29 @@ Item {
         isClosing = false;
         openedFromOverview = false;
 
-        // Disable animations so the snap is instant
         animationsEnabled = false;
 
-        // Freeze the collapsed offsets (they depend on height which could change)
         _frozenMotionX = contentContainer ? contentContainer.collapsedMotionX : 0;
         _frozenMotionY = contentContainer ? contentContainer.collapsedMotionY : (Theme.isDirectionalEffect ? Math.max(root.screenHeight - root._ccY + root.shadowPad, Theme.effectAnimOffset * 1.1) : -Theme.effectAnimOffset);
 
         var focusedScreen = CompositorService.getFocusedScreen();
         if (focusedScreen) {
-            backgroundWindow.screen = focusedScreen;
             contentWindow.screen = focusedScreen;
         }
 
-        // _motionActive = false ensures motionX/Y snap to frozen collapsed position
         _motionActive = false;
 
-        // Make windows visible but do NOT request keyboard focus yet
         ModalManager.openModal(modalHandle);
         spotlightOpen = true;
-        backgroundWindow.visible = true;
         contentWindow.visible = true;
 
-        // Load content and initialize (but no forceActiveFocus — that's deferred)
         _ensureContentLoadedAndInitialize(query || "", mode || "");
 
-        // Frame 1: enable animations and trigger enter motion
+        // Defer focus until after enter motion starts (avoids compositor IPC stalls).
         Qt.callLater(() => {
             root.animationsEnabled = true;
             root._motionActive = true;
 
-            // Frame 2: request keyboard focus + activate search field
-            // Double-deferred to avoid compositor IPC competing with animation frames
             Qt.callLater(() => {
                 root.keyboardActive = true;
                 if (root.spotlightContent && root.spotlightContent.searchField)
@@ -474,11 +440,9 @@ Item {
         spotlightContent?.closeTransientUi?.();
         openedFromOverview = false;
         isClosing = true;
-        // For directional effects, defer contentVisible=false so content stays rendered during exit slide
         if (!Theme.isDirectionalEffect)
             contentVisible = false;
 
-        // Trigger exit animation — Behaviors will animate motionX/Y to frozen collapsed position
         _motionActive = false;
 
         keyboardActive = false;
@@ -519,7 +483,6 @@ Item {
             isClosing = false;
             contentVisible = false;
             contentWindow.visible = false;
-            backgroundWindow.visible = false;
             if (root.unloadContentOnClose)
                 launcherContentLoader.active = false;
             dialogClosed();
@@ -588,7 +551,6 @@ Item {
 
             root._releaseModalChrome();
             root._windowEnabled = false;
-            backgroundWindow.screen = newScreen;
             contentWindow.screen = newScreen;
             Qt.callLater(() => {
                 root._windowEnabled = true;
@@ -596,73 +558,6 @@ Item {
         }
     }
 
-    PanelWindow {
-        id: backgroundWindow
-        visible: false
-        color: "transparent"
-
-        readonly property real _topMargin: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
-        readonly property real _bottomMargin: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
-        readonly property real _leftMargin: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
-        readonly property real _rightMargin: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
-
-        WlrLayershell.namespace: "dms:spotlight:bg"
-        WlrLayershell.layer: root.effectiveLauncherLayer
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        WlrLayershell.margins {
-            top: backgroundWindow._topMargin
-            bottom: backgroundWindow._bottomMargin
-            left: backgroundWindow._leftMargin
-            right: backgroundWindow._rightMargin
-        }
-
-        anchors {
-            top: true
-            bottom: true
-            left: true
-            right: true
-        }
-
-        mask: Region {
-            item: (spotlightOpen || isClosing) ? bgFullScreenMask : null
-
-            Region {
-                item: bgContentHole
-                intersection: Intersection.Subtract
-            }
-        }
-
-        Item {
-            id: bgFullScreenMask
-            anchors.fill: parent
-        }
-
-        Item {
-            id: bgContentHole
-            visible: false
-            x: root._cwMarginLeft + contentContainer.x - backgroundWindow._leftMargin
-            y: root._cwMarginTop + contentContainer.y - backgroundWindow._topMargin
-            width: root.alignedWidth
-            height: root.contentSurfaceHeight
-        }
-
-        Rectangle {
-            id: backgroundDarken
-            anchors.fill: parent
-            color: "black"
-            opacity: 0
-            visible: false
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: spotlightOpen
-            onClicked: root.hide()
-        }
-    }
-
     PanelWindow {
         id: contentWindow
         visible: false
@@ -687,18 +582,26 @@ Item {
         anchors {
             left: true
             top: true
+            right: true
+            bottom: true
         }
 
-        WlrLayershell.margins {
-            left: root._cwMarginLeft
-            top: root._cwMarginTop
-        }
-
-        implicitWidth: root._cwWidth
-        implicitHeight: root._cwHeight
-
         mask: Region {
-            item: contentInputMask
+            item: (root.spotlightOpen || root.isClosing) ? dismissArea : contentInputMask
+
+            Region {
+                item: (root.spotlightOpen || root.isClosing) ? contentInputMask : null
+            }
+        }
+
+        Item {
+            id: dismissArea
+            visible: false
+            anchors.fill: parent
+            anchors.topMargin: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
+            anchors.bottomMargin: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
+            anchors.leftMargin: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
+            anchors.rightMargin: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
         }
 
         Item {
@@ -710,16 +613,31 @@ Item {
             height: root.contentSurfaceHeight
         }
 
+        MouseArea {
+            anchors.fill: dismissArea
+            enabled: root.spotlightOpen
+            z: -2
+            onClicked: root.hide()
+        }
+
         Item {
             id: contentContainer
 
-            // For directional/depth: contentContainer is at alignedY from window top (window starts at screen top)
-            // For standard: contentContainer is at shadowPad from window top (window starts near modal)
             x: root._ccX
             y: root._ccY
             width: root.alignedWidth
             height: root.contentSurfaceHeight
 
+            MouseArea {
+                anchors.fill: parent
+                enabled: root.spotlightOpen
+                hoverEnabled: false
+                acceptedButtons: Qt.AllButtons
+                onPressed: mouse.accepted = true
+                onClicked: mouse.accepted = true
+                z: -1
+            }
+
             readonly property int dockEdge: typeof SettingsData !== "undefined" ? SettingsData.dockPosition : 1
             readonly property bool dockTop: dockEdge === 0
             readonly property bool dockBottom: dockEdge === 1
@@ -774,7 +692,6 @@ Item {
                 return -Math.max((root.shadowPad || 0) + Theme.effectAnimOffset, 40);
             }
 
-            // openProgress: 0 = closed (at frozenMotion, scaleCollapsed), 1 = open (at 0, scale 1).
             QtObject {
                 id: morph
                 property real openProgress: root._motionActive ? 1 : 0
@@ -833,7 +750,6 @@ Item {
                     width: contentContainer.width
                     height: contentContainer.height
 
-                    // Shadow mirrors contentWrapper position/scale/opacity
                     ElevationShadow {
                         id: launcherShadowLayer
                         width: parent.width
@@ -851,7 +767,6 @@ Item {
                         shadowEnabled: !root.frameOwnsConnectedChrome && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
                     }
 
-                    // contentWrapper moves inside static contentContainer — DankPopout pattern
                     Item {
                         id: contentWrapper
                         width: parent.width

quickshell/Modals/DankLauncherV2/DankLauncherV2ModalSpotlight.qml

@@ -84,14 +84,14 @@ Item {
     readonly property real alignedX: Theme.snap(modalX, dpr)
     readonly property real alignedY: Theme.snap(modalY, dpr)
 
-    // Extra headroom above the window for the slide-in animation
+    // Extra headroom above the content for the slide-in animation
     readonly property real _animHeadroom: 16
     readonly property real windowX: Math.max(0, Theme.snap(alignedX - shadowPad, dpr))
     readonly property real windowY: Math.max(0, Theme.snap(alignedY - shadowPad - _animHeadroom, dpr))
     readonly property real contentX: Theme.snap(alignedX - windowX, dpr)
     readonly property real contentY: Theme.snap(alignedY - windowY, dpr)
-    readonly property real windowWidth: alignedWidth + contentX + shadowPad
     readonly property real _animatedContentH: Theme.snap(_contentImplicitH, dpr)
+    readonly property real windowWidth: alignedWidth + contentX + shadowPad
     readonly property real windowHeight: _animatedContentH + contentY + shadowPad + _animHeadroom
 
     readonly property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
@@ -114,6 +114,7 @@ Item {
         }
     }
     readonly property int borderWidth: SettingsData.dankLauncherV2BorderEnabled ? SettingsData.dankLauncherV2BorderThickness : 0
+    readonly property bool useSingleWindow: CompositorService.isHyprland || useBackgroundDarken
 
     signal dialogClosed
 
@@ -267,8 +268,9 @@ Item {
     PanelWindow {
         id: clickCatcher
         screen: launcherWindow.screen
-        visible: (spotlightOpen || isClosing) && !root.useBackgroundDarken
+        visible: (spotlightOpen || isClosing) && !root.useSingleWindow
         color: "transparent"
+        updatesEnabled: false
 
         WlrLayershell.namespace: "dms:spotlight:clickcatcher"
         WlrLayershell.layer: root.effectiveLauncherLayer
@@ -339,19 +341,19 @@ Item {
         anchors {
             top: true
             left: true
-            right: root.useBackgroundDarken
-            bottom: root.useBackgroundDarken
+            right: root.useSingleWindow
+            bottom: root.useSingleWindow
         }
 
         WlrLayershell.margins {
-            left: root.useBackgroundDarken ? 0 : root.windowX
-            top: root.useBackgroundDarken ? 0 : root.windowY
+            left: root.useSingleWindow ? 0 : root.windowX
+            top: root.useSingleWindow ? 0 : root.windowY
             right: 0
             bottom: 0
         }
 
-        implicitWidth: root.useBackgroundDarken ? 0 : root.windowWidth
-        implicitHeight: root.useBackgroundDarken ? 0 : root.windowHeight
+        implicitWidth: root.useSingleWindow ? 0 : root.windowWidth
+        implicitHeight: root.useSingleWindow ? 0 : root.windowHeight
 
         mask: Region {
             item: inputMask
@@ -361,15 +363,15 @@ Item {
             id: inputMask
             visible: false
             color: "transparent"
-            x: root.useBackgroundDarken ? 0 : modalContainer.x
-            y: root.useBackgroundDarken ? 0 : modalContainer.y + modalContainer.slideOffset
-            width: root.useBackgroundDarken ? launcherWindow.width : root.alignedWidth
-            height: root.useBackgroundDarken ? launcherWindow.height : root._contentImplicitH
+            x: root.useSingleWindow ? 0 : modalContainer.x
+            y: root.useSingleWindow ? 0 : modalContainer.y + modalContainer.slideOffset
+            width: root.useSingleWindow ? launcherWindow.width : root.alignedWidth
+            height: root.useSingleWindow ? launcherWindow.height : root._contentImplicitH
         }
 
         MouseArea {
             anchors.fill: parent
-            enabled: root.useBackgroundDarken && spotlightOpen
+            enabled: root.useSingleWindow && spotlightOpen
             z: -2
             onClicked: root.hide()
         }
@@ -393,13 +395,23 @@ Item {
 
         Item {
             id: modalContainer
-            x: root.useBackgroundDarken ? root.alignedX : root.contentX
-            y: root.useBackgroundDarken ? root.alignedY : root.contentY
+            x: root.useSingleWindow ? root.alignedX : root.contentX
+            y: root.useSingleWindow ? root.alignedY : root.contentY
             width: root.alignedWidth
             height: root._animatedContentH
             visible: _renderActive
             z: 0
 
+            MouseArea {
+                anchors.fill: parent
+                enabled: spotlightOpen
+                hoverEnabled: false
+                acceptedButtons: Qt.AllButtons
+                onPressed: mouse.accepted = true
+                onClicked: mouse.accepted = true
+                z: -1
+            }
+
             property bool _renderActive: contentVisible
             property real slideOffset: contentVisible ? 0 : -root._animHeadroom
 

quickshell/Modals/DankLauncherV2/DankLauncherV2ModalStandalone.qml

@@ -80,6 +80,7 @@ Item {
 
     readonly property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     readonly property bool useBackgroundDarken: !SettingsData.frameEnabled && SettingsData.modalDarkenBackground
+    readonly property bool useSingleWindow: CompositorService.isHyprland || useBackgroundDarken
     readonly property bool usesOverlayLayer: useBackgroundDarken || SettingsData.launcherUseOverlayLayer || triggerUsesOverlayLayer
     readonly property var effectiveLauncherLayer: LayerShell.fromEnv("DMS_MODAL_LAYER", root.usesOverlayLayer ? WlrLayer.Overlay : WlrLayer.Top, {
         "allow": ["top", "overlay"],
@@ -303,8 +304,9 @@ Item {
     PanelWindow {
         id: clickCatcher
         screen: launcherWindow.screen
-        visible: (spotlightOpen || isClosing) && !root.useBackgroundDarken
+        visible: (spotlightOpen || isClosing) && !root.useSingleWindow
         color: "transparent"
+        updatesEnabled: false
 
         WlrLayershell.namespace: "dms:spotlight:clickcatcher"
         WlrLayershell.layer: root.effectiveLauncherLayer
@@ -375,19 +377,19 @@ Item {
         anchors {
             top: true
             left: true
-            right: root.useBackgroundDarken
-            bottom: root.useBackgroundDarken
+            right: root.useSingleWindow
+            bottom: root.useSingleWindow
         }
 
         WlrLayershell.margins {
-            left: root.useBackgroundDarken ? 0 : root.windowX
-            top: root.useBackgroundDarken ? 0 : root.windowY
+            left: root.useSingleWindow ? 0 : root.windowX
+            top: root.useSingleWindow ? 0 : root.windowY
             right: 0
             bottom: 0
         }
 
-        implicitWidth: root.useBackgroundDarken ? 0 : root.windowWidth
-        implicitHeight: root.useBackgroundDarken ? 0 : root.windowHeight
+        implicitWidth: root.useSingleWindow ? 0 : root.windowWidth
+        implicitHeight: root.useSingleWindow ? 0 : root.windowHeight
 
         mask: Region {
             item: launcherInputMask
@@ -397,15 +399,15 @@ Item {
             id: launcherInputMask
             visible: false
             color: "transparent"
-            x: root.useBackgroundDarken ? 0 : modalContainer.x
-            y: root.useBackgroundDarken ? 0 : modalContainer.y
-            width: root.useBackgroundDarken ? launcherWindow.width : modalContainer.width
-            height: root.useBackgroundDarken ? launcherWindow.height : modalContainer.height
+            x: root.useSingleWindow ? 0 : modalContainer.x
+            y: root.useSingleWindow ? 0 : modalContainer.y
+            width: root.useSingleWindow ? launcherWindow.width : modalContainer.width
+            height: root.useSingleWindow ? launcherWindow.height : modalContainer.height
         }
 
         MouseArea {
             anchors.fill: parent
-            enabled: root.useBackgroundDarken && spotlightOpen
+            enabled: root.useSingleWindow && spotlightOpen
             z: -2
             onClicked: root.hide()
         }
@@ -429,13 +431,23 @@ Item {
 
         Item {
             id: modalContainer
-            x: root.useBackgroundDarken ? root.alignedX : root.contentX
-            y: root.useBackgroundDarken ? root.alignedY : root.contentY
+            x: root.useSingleWindow ? root.alignedX : root.contentX
+            y: root.useSingleWindow ? root.alignedY : root.contentY
             width: root.alignedWidth
             height: root.alignedHeight
             visible: _renderActive
             z: 0
 
+            MouseArea {
+                anchors.fill: parent
+                enabled: spotlightOpen
+                hoverEnabled: false
+                acceptedButtons: Qt.AllButtons
+                onPressed: mouse.accepted = true
+                onClicked: mouse.accepted = true
+                z: -1
+            }
+
             property bool _renderActive: contentVisible
             property real publishedScale: contentVisible ? 1 : 0.96
             property real publishedOpacity: contentVisible ? 1 : 0

quickshell/Modals/FileBrowser/FileBrowserContent.qml

@@ -201,6 +201,21 @@ FocusScope {
         keyboardSelectionRequested = true;
     }
 
+    function activateFile(path, name, isDir) {
+        if (isDir) {
+            navigateTo(path);
+            return;
+        }
+        if (saveMode) {
+            saveRow.fileName = name;
+            pendingFilePath = path;
+            showOverwriteConfirmation = true;
+        } else {
+            fileSelected(path);
+            closeRequested();
+        }
+    }
+
     function handleSaveFile(filePath) {
         var normalizedPath = filePath;
         if (!normalizedPath.startsWith("file://")) {
@@ -652,6 +667,7 @@ FocusScope {
 
             Row {
                 anchors.fill: parent
+                anchors.bottomMargin: root.saveMode ? 40 + Theme.spacingL * 2 : 0
                 spacing: 0
 
                 Row {
@@ -756,12 +772,7 @@ FocusScope {
                                 onItemClicked: (index, path, name, isDir) => {
                                     selectedIndex = index;
                                     setSelectedFileData(path, name, isDir);
-                                    if (isDir) {
-                                        navigateTo(path);
-                                    } else {
-                                        fileSelected(path);
-                                        root.closeRequested();
-                                    }
+                                    root.activateFile(path, name, isDir);
                                 }
                                 onItemSelected: (index, path, name, isDir) => {
                                     setSelectedFileData(path, name, isDir);
@@ -776,12 +787,7 @@ FocusScope {
                                             root.keyboardSelectionRequested = false;
                                             selectedIndex = index;
                                             setSelectedFileData(filePath, fileName, fileIsDir);
-                                            if (fileIsDir) {
-                                                navigateTo(filePath);
-                                            } else {
-                                                fileSelected(filePath);
-                                                root.closeRequested();
-                                            }
+                                            root.activateFile(filePath, fileName, fileIsDir);
                                         }
                                     }
 
@@ -817,12 +823,7 @@ FocusScope {
                                 onItemClicked: (index, path, name, isDir) => {
                                     selectedIndex = index;
                                     setSelectedFileData(path, name, isDir);
-                                    if (isDir) {
-                                        navigateTo(path);
-                                    } else {
-                                        fileSelected(path);
-                                        root.closeRequested();
-                                    }
+                                    root.activateFile(path, name, isDir);
                                 }
                                 onItemSelected: (index, path, name, isDir) => {
                                     setSelectedFileData(path, name, isDir);
@@ -837,12 +838,7 @@ FocusScope {
                                             root.keyboardSelectionRequested = false;
                                             selectedIndex = index;
                                             setSelectedFileData(filePath, fileName, fileIsDir);
-                                            if (fileIsDir) {
-                                                navigateTo(filePath);
-                                            } else {
-                                                fileSelected(filePath);
-                                                root.closeRequested();
-                                            }
+                                            root.activateFile(filePath, fileName, fileIsDir);
                                         }
                                     }
 
@@ -855,6 +851,7 @@ FocusScope {
             }
 
             FileBrowserSaveRow {
+                id: saveRow
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -913,21 +910,21 @@ FocusScope {
                 }
             }
         }
+    }
 
-        FileBrowserOverwriteDialog {
-            anchors.fill: parent
-            showDialog: showOverwriteConfirmation
-            pendingFilePath: root.pendingFilePath
-            onConfirmed: filePath => {
-                showOverwriteConfirmation = false;
-                fileSelected(filePath);
-                pendingFilePath = "";
-                Qt.callLater(() => root.closeRequested());
-            }
-            onCancelled: {
-                showOverwriteConfirmation = false;
-                pendingFilePath = "";
-            }
+    FileBrowserOverwriteDialog {
+        anchors.fill: parent
+        showDialog: showOverwriteConfirmation
+        pendingFilePath: root.pendingFilePath
+        onConfirmed: filePath => {
+            showOverwriteConfirmation = false;
+            fileSelected(filePath);
+            pendingFilePath = "";
+            Qt.callLater(() => root.closeRequested());
+        }
+        onCancelled: {
+            showOverwriteConfirmation = false;
+            pendingFilePath = "";
         }
     }
 

quickshell/Modals/FileBrowser/FileBrowserOverwriteDialog.qml

@@ -74,7 +74,7 @@ Item {
                     width: 80
                     height: 36
                     radius: Theme.cornerRadius
-                    color: cancelArea.containsMouse ? Theme.surfaceVariantHover : Theme.surfaceVariant
+                    color: cancelArea.containsMouse ? Qt.lighter(Theme.surfaceVariant, 1.2) : Theme.surfaceVariant
                     border.color: Theme.outline
                     border.width: 1
 

quickshell/Modals/FileBrowser/FileBrowserSaveRow.qml

@@ -8,6 +8,7 @@ Row {
     property bool saveMode: false
     property string defaultFileName: ""
     property string currentPath: ""
+    property alias fileName: fileNameInput.text
 
     signal saveRequested(string filePath)
 

quickshell/Modals/Greeter/GreeterCompletePage.qml

@@ -320,8 +320,6 @@ Item {
                                     url = "https://danklinux.com/docs/dankmaterialshell/compositors#dms-keybindings";
                                 else if (CompositorService.isHyprland)
                                     url = "https://danklinux.com/docs/dankmaterialshell/compositors#dms-keybindings-1";
-                                else if (CompositorService.isDwl)
-                                    url = "https://danklinux.com/docs/dankmaterialshell/compositors#dms-keybindings-2";
                                 else if (CompositorService.isMango)
                                     url = "https://danklinux.com/docs/dankmaterialshell/compositors#dms-keybindings-2";
                                 Qt.openUrlExternally(url);

quickshell/Modals/Greeter/GreeterWelcomePage.qml

@@ -130,7 +130,7 @@ Item {
                     title: I18n.tr("Multi-Monitor", "greeter feature card title")
                     description: I18n.tr("Per-screen config", "greeter feature card description")
                     onClicked: {
-                        const hasDisplayConfig = CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isMango;
+                        const hasDisplayConfig = CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango;
                         PopoutService.openSettingsWithTab(hasDisplayConfig ? "display_config" : "display_widgets");
                     }
                 }

quickshell/Modals/PowerMenuModal.qml

@@ -11,6 +11,7 @@ DankModal {
 
     layerNamespace: "dms:power-menu"
     keepPopoutsOpen: true
+    useOverlayLayer: true
 
     property int selectedIndex: 0
     property int selectedRow: 0

quickshell/Modals/Settings/SettingsContent.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import qs.Common
 import qs.Modules.Settings
+import qs.Services
 import qs.Widgets
 
 FocusScope {
@@ -98,7 +99,7 @@ FocusScope {
             visible: active
             focus: active
 
-            sourceComponent: CompositorTab {}
+            sourceComponent: WorkspacesTab {}
 
             onActiveChanged: {
                 if (active && item)
@@ -106,6 +107,44 @@ FocusScope {
             }
         }
 
+        Loader {
+            id: compositorLayoutLoader
+            anchors.fill: parent
+            active: root.currentIndex === 37
+            visible: active
+            focus: active
+
+            sourceComponent: CompositorLayoutTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: windowRulesLoader
+
+            property bool loadedOnce: false
+
+            anchors.fill: parent
+            active: root.currentIndex === 38 || loadedOnce
+            visible: root.currentIndex === 38 && status === Loader.Ready
+            focus: visible
+            asynchronous: true
+
+            sourceComponent: WindowRulesTab {
+                pageActive: root.currentIndex === 38
+            }
+
+            onLoaded: loadedOnce = true
+        }
+
+        DankSpinner {
+            anchors.centerIn: parent
+            visible: root.currentIndex === 38 && windowRulesLoader.status === Loader.Loading
+        }
+
         Loader {
             id: dankBarAppearanceLoader
             anchors.fill: parent
@@ -194,7 +233,52 @@ FocusScope {
             visible: active
             focus: active
 
-            sourceComponent: NetworkTab {}
+            sourceComponent: NetworkStatusTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: networkEthernetLoader
+            anchors.fill: parent
+            active: root.currentIndex === 39
+            visible: active
+            focus: active
+
+            sourceComponent: NetworkEthernetTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: networkWifiLoader
+            anchors.fill: parent
+            active: root.currentIndex === 40
+            visible: active
+            focus: active
+
+            sourceComponent: NetworkWifiTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: networkVpnLoader
+            anchors.fill: parent
+            active: root.currentIndex === 41
+            visible: active
+            focus: active
+
+            sourceComponent: NetworkVpnTab {}
 
             onActiveChanged: {
                 if (active && item)
@@ -388,7 +472,7 @@ FocusScope {
             }
         }
 
-		Loader {
+        Loader {
             id: defaultAppsLoader
             anchors.fill: parent
             active: root.currentIndex === 34
@@ -474,12 +558,9 @@ FocusScope {
             }
         }
 
-        StyledText {
+        DankSpinner {
             anchors.centerIn: parent
             visible: root.currentIndex === 22 && widgetsLoader.status === Loader.Loading
-            text: I18n.tr("Loading...", "loading indicator")
-            color: Theme.surfaceVariantText
-            font.pixelSize: Theme.fontSizeMedium
         }
 
         Loader {

quickshell/Modals/Settings/SettingsModal.qml

@@ -53,20 +53,21 @@ FloatingWindow {
         visible = !visible;
     }
 
+    function setTabIndex(tabIndex: int) {
+        if (tabIndex < 0)
+            return;
+        currentTabIndex = tabIndex;
+        sidebar.autoExpandForTab(tabIndex);
+    }
+
     function showWithTab(tabIndex: int) {
-        if (tabIndex >= 0) {
-            currentTabIndex = tabIndex;
-            sidebar.autoExpandForTab(tabIndex);
-        }
+        setTabIndex(tabIndex);
         visible = true;
     }
 
     function showWithTabName(tabName: string) {
         var idx = sidebar.resolveTabIndex(tabName);
-        if (idx >= 0) {
-            currentTabIndex = idx;
-            sidebar.autoExpandForTab(idx);
-        }
+        setTabIndex(idx);
         visible = true;
     }
 

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -102,6 +102,13 @@ Rectangle {
                     "icon": "volume_up",
                     "tabIndex": 15,
                     "soundsOnly": true
+                },
+                {
+                    "id": "compositor_layout",
+                    "text": CompositorService.isNiri ? "Niri" : (CompositorService.isHyprland ? "Hyprland" : "MangoWC"),
+                    "icon": "layers",
+                    "tabIndex": 37,
+                    "layoutCapable": true
                 }
             ]
         },
@@ -110,24 +117,30 @@ Rectangle {
             "text": I18n.tr("Dank Bar"),
             "icon": "toolbar",
             "children": [
-                {
-                    "id": "dankbar_settings",
-                    "text": I18n.tr("Settings"),
-                    "icon": "tune",
-                    "tabIndex": 3
-                },
                 {
                     "id": "dankbar_appearance",
                     "text": I18n.tr("Appearance"),
                     "icon": "palette",
                     "tabIndex": 6
                 },
+                {
+                    "id": "dankbar_settings",
+                    "text": I18n.tr("Settings"),
+                    "icon": "tune",
+                    "tabIndex": 3
+                },
                 {
                     "id": "dankbar_widgets",
                     "text": I18n.tr("Widgets"),
                     "icon": "widgets",
                     "tabIndex": 22
                 },
+                {
+                    "id": "workspaces",
+                    "text": I18n.tr("Workspaces"),
+                    "icon": "view_module",
+                    "tabIndex": 4
+                },
                 {
                     "id": "frame",
                     "text": I18n.tr("Frame"),
@@ -188,12 +201,6 @@ Rectangle {
                 }
             ]
         },
-        {
-            "id": "compositor",
-            "text": I18n.tr("Compositor"),
-            "icon": "layers",
-            "tabIndex": 4
-        },
         {
             "id": "keybinds",
             "text": I18n.tr("Keyboard Shortcuts"),
@@ -231,8 +238,33 @@ Rectangle {
             "id": "network",
             "text": I18n.tr("Network"),
             "icon": "wifi",
-            "tabIndex": 7,
-            "dmsOnly": true
+            "dmsOnly": true,
+            "children": [
+                {
+                    "id": "network_status",
+                    "text": I18n.tr("Status"),
+                    "icon": "lan",
+                    "tabIndex": 7
+                },
+                {
+                    "id": "network_ethernet",
+                    "text": I18n.tr("Ethernet"),
+                    "icon": "settings_ethernet",
+                    "tabIndex": 39
+                },
+                {
+                    "id": "network_wifi",
+                    "text": I18n.tr("WiFi"),
+                    "icon": "wifi",
+                    "tabIndex": 40
+                },
+                {
+                    "id": "network_vpn",
+                    "text": I18n.tr("VPN"),
+                    "icon": "vpn_key",
+                    "tabIndex": 41
+                }
+            ]
         },
         {
             "id": "applications",
@@ -259,6 +291,13 @@ Rectangle {
                     "icon": "line_start",
                     "tabIndex": 36,
                     "autostartOnly": true
+                },
+                {
+                    "id": "window_rules",
+                    "text": I18n.tr("Window Rules"),
+                    "icon": "select_window",
+                    "tabIndex": 38,
+                    "windowRulesCapable": true
                 }
             ]
         },
@@ -372,6 +411,8 @@ Rectangle {
             return false;
         if (item.windowRulesCapable && !CompositorService.isNiri && !CompositorService.isHyprland && !CompositorService.isMango)
             return false;
+        if (item.layoutCapable && !CompositorService.isNiri && !CompositorService.isHyprland && !CompositorService.isMango)
+            return false;
         if (item.niriOnly && !CompositorService.isNiri)
             return false;
         if (item.clipboardOnly && (!DMSService.isConnected || DMSService.apiVersion < 23))
@@ -544,8 +585,8 @@ Rectangle {
             return -1;
 
         var normalized = name.toLowerCase().replace(/[_\-\s]/g, "");
-        if (normalized === "workspaces")
-            normalized = "compositor";
+        if (normalized === "compositor")
+            normalized = "workspaces";
 
         for (var i = 0; i < categoryStructure.length; i++) {
             var cat = categoryStructure[i];

quickshell/Modules/BlurredWallpaperBackground.qml

@@ -7,6 +7,7 @@ import qs.Widgets
 import qs.Services
 
 Variants {
+    readonly property var log: Log.scoped("BlurredWallpaperBackground")
     model: {
         if (SessionData.isGreeterMode) {
             return Quickshell.screens;
@@ -32,6 +33,8 @@ Variants {
 
         color: "transparent"
 
+        updatesEnabled: root.renderActive || root._settleFrames > 0
+
         mask: Region {
             item: Item {}
         }
@@ -85,7 +88,6 @@ Variants {
             }
 
             Component.onCompleted: {
-                blurWallpaperWindow.updatesEnabled = Qt.binding(() => !root.source || root.effectActive || root._renderSettling || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading);
                 isInitialized = true;
             }
 
@@ -93,51 +95,67 @@ Variants {
             property real transitionProgress: 0
             readonly property bool transitioning: transitionAnimation.running
             property bool effectActive: false
-            property bool _renderSettling: true
             property bool useNextForEffect: false
+            readonly property var backingWindow: Window.window
+            readonly property bool renderActive: !source || effectActive || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading
+            property int _settleFrames: 3
 
-            Connections {
-                target: currentWallpaper
-                function onStatusChanged() {
-                    if (currentWallpaper.status !== Image.Ready && currentWallpaper.status !== Image.Error)
-                        return;
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
-                }
+            function invalidate() {
+                _settleFrames = 3;
+                backingWindow?.update();
             }
 
+            onRenderActiveChanged: invalidate()
+            onBackingWindowChanged: invalidate()
+
             Connections {
-                target: blurWallpaperWindow
+                target: root.backingWindow
+                function onFrameSwapped() {
+                    if (root._settleFrames > 0)
+                        root._settleFrames--;
+                }
+                function onVisibleChanged() {
+                    root.invalidate();
+                }
                 function onWidthChanged() {
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
+                    root.invalidate();
                 }
                 function onHeightChanged() {
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
+                    root.invalidate();
                 }
             }
 
             Connections {
                 target: Quickshell
                 function onScreensChanged() {
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
+                    root.invalidate();
                 }
             }
 
             Connections {
                 target: SettingsData
                 function onWallpaperFillModeChanged() {
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
+                    root.invalidate();
                 }
             }
 
-            Timer {
-                id: renderSettleTimer
-                interval: 1000
-                onTriggered: root._renderSettling = false
+            Connections {
+                target: IdleService
+                function onIsShellLockedChanged() {
+                    if (IdleService.isShellLocked)
+                        return;
+                    root.invalidate();
+                }
+            }
+
+            function handleTransitionLoadError(failedSource) {
+                log.warn("failed to load candidate wallpaper for", modelData.name + ":", failedSource);
+                transitionDelayTimer.stop();
+                transitionAnimation.stop();
+                root.useNextForEffect = false;
+                root.effectActive = false;
+                root.transitionProgress = 0.0;
+                nextWallpaper.source = "";
             }
 
             onSourceChanged: {
@@ -164,8 +182,6 @@ Variants {
                 transitionAnimation.stop();
                 root.transitionProgress = 0.0;
                 root.effectActive = false;
-                root._renderSettling = true;
-                renderSettleTimer.restart();
                 currentWallpaper.source = newSource;
                 nextWallpaper.source = "";
             }
@@ -194,8 +210,6 @@ Variants {
                     transitionAnimation.stop();
                     root.transitionProgress = 0;
                     root.effectActive = false;
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
                     currentWallpaper.source = nextWallpaper.source;
                     nextWallpaper.source = "";
                 }
@@ -204,9 +218,6 @@ Variants {
                     return;
                 }
 
-                root._renderSettling = true;
-                renderSettleTimer.restart();
-
                 nextWallpaper.source = newPath;
 
                 if (nextWallpaper.status === Image.Ready)
@@ -215,7 +226,7 @@ Variants {
 
             Loader {
                 anchors.fill: parent
-                active: !root.source || root.isColorSource
+                active: !root.source || root.isColorSource || currentWallpaper.status === Image.Error
                 asynchronous: true
 
                 sourceComponent: DankBackdrop {
@@ -238,6 +249,12 @@ Variants {
                 cache: true
                 sourceSize: Qt.size(root.textureWidth, root.textureHeight)
                 fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SessionData.getMonitorWallpaperFillMode(modelData.name))
+
+                onStatusChanged: {
+                    if (status === Image.Error) {
+                        log.warn("failed to load active wallpaper for", modelData.name + ":", source);
+                    }
+                }
             }
 
             Image {
@@ -253,6 +270,10 @@ Variants {
                 fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SessionData.getMonitorWallpaperFillMode(modelData.name))
 
                 onStatusChanged: {
+                    if (status === Image.Error) {
+                        root.handleTransitionLoadError(source);
+                        return;
+                    }
                     if (status !== Image.Ready)
                         return;
                     if (!root.transitioning) {
@@ -329,8 +350,6 @@ Variants {
                     root.useNextForEffect = false;
                     nextWallpaper.source = "";
                     root.transitionProgress = 0.0;
-                    root._renderSettling = true;
-                    renderSettleTimer.restart();
                     root.effectActive = false;
                 }
             }

quickshell/Modules/ControlCenter/Components/HeaderPane.qml

@@ -60,7 +60,7 @@ Rectangle {
             }
 
             Typography {
-                text: DgopService.uptime ? I18n.tr("up") + " " + DgopService.uptime.slice(3) : I18n.tr("Unknown")
+                text: DgopService.uptime ? I18n.tr("up", "uptime prefix, e.g. 'up 4h 2m'") + " " + DgopService.uptime.slice(3) : I18n.tr("Unknown")
                 style: Typography.Style.Caption
                 color: Theme.surfaceVariantText
             }

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -151,7 +151,7 @@ Rectangle {
                 iconColor: Theme.surfaceVariantText
                 onClicked: {
                     PopoutService.closeControlCenter();
-                    PopoutService.openSettingsWithTab("network");
+                    PopoutService.openSettingsWithTab(currentPreferenceIndex === 0 ? "network_ethernet" : "network_wifi");
                 }
             }
         }

quickshell/Modules/DankBar/CenterSection.qml

@@ -15,6 +15,7 @@ Item {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
+    property real sectionAvailablePrimarySize: 0
     property bool overrideAxisLayout: false
     property bool forceVerticalLayout: false
 
@@ -359,6 +360,7 @@ Item {
                 barSpacing: root.barSpacing
                 barConfig: root.barConfig
                 blurBarWindow: root.blurBarWindow
+                sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                 isFirst: index === 0
                 isLast: index === centerRepeater.count - 1
                 sectionSpacing: parent.itemSpacing

quickshell/Modules/DankBar/DankBar.qml

@@ -108,8 +108,6 @@ Item {
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             focusedScreenName = focusedWs?.monitor?.name || "";
-        } else if (CompositorService.isDwl && DwlService.activeOutput) {
-            focusedScreenName = DwlService.activeOutput;
         } else if (CompositorService.isMango && MangoService.activeOutput) {
             focusedScreenName = MangoService.activeOutput;
         }
@@ -139,8 +137,6 @@ Item {
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             focusedScreenName = focusedWs?.monitor?.name || "";
-        } else if (CompositorService.isDwl && DwlService.activeOutput) {
-            focusedScreenName = DwlService.activeOutput;
         } else if (CompositorService.isMango && MangoService.activeOutput) {
             focusedScreenName = MangoService.activeOutput;
         }

quickshell/Modules/DankBar/DankBarContent.qml

@@ -29,7 +29,6 @@ Item {
     readonly property real _frameEdgeFloorInset: (SettingsData.frameEnabled && _usesFrameBarChrome) ? Math.max(0, SettingsData.frameThickness - _edgeBaseMargin) : 0
     readonly property bool _barIsVertical: _hasBarWindow ? barWindow.isVertical : false
     readonly property string _barScreenName: _hasBarWindow ? (barWindow.screenName || "") : ""
-    readonly property var dwlSvc: CompositorService.isMango ? MangoService : DwlService
     readonly property bool hasAdjacentTopBarLive: _hasBarWindow && barWindow.hasAdjacentTopBar
     readonly property bool hasAdjacentBottomBarLive: _hasBarWindow && barWindow.hasAdjacentBottomBar
     readonly property bool hasAdjacentLeftBarLive: _hasBarWindow && barWindow.hasAdjacentLeftBar
@@ -190,16 +189,16 @@ Item {
             }
 
             return monitorWorkspaces.sort((a, b) => a.id - b.id);
-        } else if (CompositorService.isDwl || CompositorService.isMango) {
-            if (!dwlSvc.available) {
+        } else if (CompositorService.isMango) {
+            if (!MangoService.available) {
                 return [0];
             }
             if (SettingsData.dwlShowAllTags) {
                 return Array.from({
-                    length: dwlSvc.tagCount
+                    length: MangoService.tagCount
                 }, (_, i) => i);
             }
-            return dwlSvc.getVisibleTags(screenName);
+            return MangoService.getVisibleTags(screenName);
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             const workspaces = I3.workspaces?.values || [];
             if (workspaces.length === 0)
@@ -235,13 +234,13 @@ Item {
             const monitors = Hyprland.monitors?.values || [];
             const currentMonitor = monitors.find(monitor => monitor.name === screenName);
             return currentMonitor?.activeWorkspace?.id ?? 1;
-        } else if (CompositorService.isDwl || CompositorService.isMango) {
-            if (!dwlSvc.available)
+        } else if (CompositorService.isMango) {
+            if (!MangoService.available)
                 return 0;
-            const outputState = dwlSvc.getOutputState(screenName);
+            const outputState = MangoService.getOutputState(screenName);
             if (!outputState || !outputState.tags)
                 return 0;
-            const activeTags = dwlSvc.getActiveTags(screenName);
+            const activeTags = MangoService.getActiveTags(screenName);
             return activeTags.length > 0 ? activeTags[0] : 0;
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             if (!screenName || SettingsData.workspaceFollowFocus) {
@@ -283,14 +282,14 @@ Item {
             if (nextIndex !== validIndex) {
                 HyprlandService.focusWorkspace(realWorkspaces[nextIndex].id);
             }
-        } else if (CompositorService.isDwl || CompositorService.isMango) {
+        } else if (CompositorService.isMango) {
             const currentTag = getCurrentWorkspace();
             const currentIndex = realWorkspaces.findIndex(tag => tag === currentTag);
             const validIndex = currentIndex === -1 ? 0 : currentIndex;
             const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0);
 
             if (nextIndex !== validIndex) {
-                dwlSvc.switchToTag(_barScreenName, realWorkspaces[nextIndex]);
+                MangoService.switchToTag(_barScreenName, realWorkspaces[nextIndex]);
             }
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             const currentWs = getCurrentWorkspace();
@@ -498,6 +497,7 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
+                sectionAvailablePrimarySize: Math.max(1, hCenterSection.x > 0 ? hCenterSection.x : parent.width / 3)
             }
 
             Binding {
@@ -530,6 +530,7 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
+                sectionAvailablePrimarySize: Math.max(1, hCenterSection.x > 0 ? parent.width - (hCenterSection.x + hCenterSection.width) : parent.width / 3)
             }
 
             Binding {
@@ -562,6 +563,7 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
+                sectionAvailablePrimarySize: Math.max(1, hRightSection.x > 0 ? hRightSection.x - (hLeftSection.x + hLeftSection.width) : parent.width / 3)
             }
 
             Binding {
@@ -601,6 +603,7 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
+                sectionAvailablePrimarySize: Math.max(1, vCenterSection.y > 0 ? vCenterSection.y : parent.height / 3)
             }
 
             Binding {
@@ -634,6 +637,7 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
+                sectionAvailablePrimarySize: Math.max(1, vRightSection.y > 0 ? vRightSection.y - (vLeftSection.y + vLeftSection.height) : parent.height / 3)
             }
 
             Binding {
@@ -668,6 +672,7 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
+                sectionAvailablePrimarySize: Math.max(1, vCenterSection.y > 0 ? parent.height - (vCenterSection.y + vCenterSection.height) : parent.height / 3)
             }
 
             Binding {

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -286,9 +286,6 @@ PanelWindow {
 
     readonly property bool isVertical: axis.isVertical
 
-    property bool gothCornersEnabled: barConfig?.gothCornersEnabled ?? false
-    property real wingtipsRadius: barConfig?.gothCornerRadiusOverride ? (barConfig?.gothCornerRadiusValue ?? 12) : Theme.cornerRadius
-    readonly property real _wingR: Math.max(0, wingtipsRadius)
     readonly property color _surfaceContainer: Theme.surfaceContainer
     readonly property string _barId: barConfig?.id ?? "default"
     property real _backgroundAlpha: barConfig?.transparency ?? 1.0
@@ -300,25 +297,30 @@ PanelWindow {
     }
     readonly property real _dpr: CompositorService.getScreenScale(barWindow.screen)
 
+    property string screenName: modelData.name
+
+    readonly property bool usesConnectedFrameChrome: CompositorService.usesConnectedFrameChromeForScreen(screenName)
+    readonly property bool usesFrameBarChrome: CompositorService.frameWindowVisibleForScreen(screenName)
+    readonly property var renderBarConfig: SettingsData.effectiveBarConfigForRender(barConfig, usesFrameBarChrome)
+
+    property bool gothCornersEnabled: renderBarConfig?.gothCornersEnabled ?? false
+    property real wingtipsRadius: renderBarConfig?.gothCornerRadiusOverride ? (renderBarConfig?.gothCornerRadiusValue ?? 12) : Theme.cornerRadius
+    readonly property real _wingR: Math.max(0, wingtipsRadius)
+
     // Shadow buffer: extra window space for shadow to render beyond bar bounds
-    readonly property bool _shadowActive: (Theme.elevationEnabled && (typeof SettingsData !== "undefined" ? (SettingsData.barElevationEnabled ?? true) : false)) || (barConfig?.shadowIntensity ?? 0) > 0
+    readonly property bool _shadowActive: (Theme.elevationEnabled && (typeof SettingsData !== "undefined" ? (SettingsData.barElevationEnabled ?? true) : false)) || (renderBarConfig?.shadowIntensity ?? 0) > 0
     readonly property real _shadowBuffer: {
         if (!_shadowActive)
             return 0;
-        const hasOverride = (barConfig?.shadowIntensity ?? 0) > 0;
+        const hasOverride = (renderBarConfig?.shadowIntensity ?? 0) > 0;
         if (hasOverride) {
-            const blur = (barConfig.shadowIntensity ?? 0) * 0.2;
+            const blur = (renderBarConfig.shadowIntensity ?? 0) * 0.2;
             const offset = blur * 0.5;
             return Theme.snap(Math.max(16, blur + offset + 8), _dpr);
         }
         return Theme.snap(Theme.elevationRenderPadding(Theme.elevationLevel2, "top", 4, 8, 16), _dpr);
     }
 
-    property string screenName: modelData.name
-
-    readonly property bool usesConnectedFrameChrome: CompositorService.usesConnectedFrameChromeForScreen(screenName)
-    readonly property bool usesFrameBarChrome: CompositorService.frameWindowVisibleForScreen(screenName)
-
     // Flatten/spacing collapse for maximized windows is only for frame-integrated layout.
     // When the bar draws its own pill, keep rounded corners and spacing like the dock.
     readonly property bool flattenForMaximizedWindow: !SettingsData.frameEnabled || usesFrameBarChrome
@@ -554,8 +556,8 @@ PanelWindow {
     }
 
     screen: modelData
-    implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
-    implicitWidth: isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
+    implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((renderBarConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
+    implicitWidth: isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((renderBarConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
     color: "transparent"
 
     Component.onCompleted: {
@@ -952,7 +954,7 @@ PanelWindow {
                         id: barBackground
                         barWindow: barWindow
                         axis: axis
-                        barConfig: barWindow.barConfig
+                        barConfig: barWindow.renderBarConfig
                     }
 
                     MouseArea {

quickshell/Modules/DankBar/LeftSection.qml

@@ -14,6 +14,7 @@ Item {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
+    property real sectionAvailablePrimarySize: 0
     property bool overrideAxisLayout: false
     property bool forceVerticalLayout: false
 
@@ -61,6 +62,7 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
+                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === rowRepeater.count - 1
                         sectionSpacing: parent.rowSpacing
@@ -106,6 +108,7 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
+                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === columnRepeater.count - 1
                         sectionSpacing: parent.columnSpacing

quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml

@@ -10,9 +10,7 @@ DankPopout {
 
     property var triggerScreen: null
 
-    // mango shares dwl's layout model; route to the right service.
-    readonly property bool isDwlLike: CompositorService.isDwl || CompositorService.isMango
-    readonly property var dwlSvc: CompositorService.isMango ? MangoService : DwlService
+    readonly property bool isMango: CompositorService.isMango
 
     function setTriggerPosition(x, y, width, section, screen, barPosition, barThickness, barSpacing, barConfig) {
         triggerX = x;
@@ -37,8 +35,8 @@ DankPopout {
     onScreenChanged: updateOutputState()
 
     function updateOutputState() {
-        if (screen && root.dwlSvc.available) {
-            outputState = root.dwlSvc.getOutputState(screen.name);
+        if (screen && MangoService.available) {
+            outputState = MangoService.getOutputState(screen.name);
         } else {
             outputState = null;
         }
@@ -84,7 +82,7 @@ DankPopout {
     }
 
     Connections {
-        target: DwlService
+        target: MangoService
         function onStateChanged() {
             updateOutputState();
         }
@@ -219,7 +217,7 @@ DankPopout {
                     spacing: Theme.spacingS
 
                     Repeater {
-                        model: root.dwlSvc.layouts
+                        model: MangoService.layouts
 
                         delegate: Rectangle {
                             required property string modelData
@@ -273,11 +271,11 @@ DankPopout {
                                     if (!root.triggerScreen) {
                                         return;
                                     }
-                                    if (!root.dwlSvc.available) {
+                                    if (!MangoService.available) {
                                         return;
                                     }
 
-                                    root.dwlSvc.setLayout(root.triggerScreen.name, index);
+                                    MangoService.setLayout(root.triggerScreen.name, index);
                                     root.close();
                                 }
                             }

quickshell/Modules/DankBar/RightSection.qml

@@ -14,6 +14,7 @@ Item {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
+    property real sectionAvailablePrimarySize: 0
     property bool overrideAxisLayout: false
     property bool forceVerticalLayout: false
 
@@ -63,6 +64,7 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
+                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === rowRepeater.count - 1
                         sectionSpacing: parent.rowSpacing
@@ -108,6 +110,7 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
+                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === columnRepeater.count - 1
                         sectionSpacing: parent.columnSpacing

quickshell/Modules/DankBar/WidgetHost.qml

@@ -17,6 +17,7 @@ Loader {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
+    property real sectionAvailablePrimarySize: 0
     property bool isFirst: false
     property bool isLast: false
     property real sectionSpacing: 0
@@ -141,6 +142,14 @@ Loader {
         restoreMode: Binding.RestoreNone
     }
 
+    Binding {
+        target: root.item
+        when: root.item && "sectionAvailablePrimarySize" in root.item
+        property: "sectionAvailablePrimarySize"
+        value: root.sectionAvailablePrimarySize
+        restoreMode: Binding.RestoreNone
+    }
+
     Binding {
         target: root.item
         when: root.item && "isLeftBarEdge" in root.item
@@ -282,7 +291,7 @@ Loader {
             "cpuTemp": dgopAvailable,
             "gpuTemp": dgopAvailable,
             "network_speed_monitor": dgopAvailable,
-            "layout": (CompositorService.isDwl && DwlService.dwlAvailable) || (CompositorService.isMango && MangoService.available)
+            "layout": CompositorService.isMango && MangoService.available
         };
 
         return widgetVisibility[widgetId] ?? true;

quickshell/Modules/DankBar/Widgets/DWLLayout.qml

@@ -13,12 +13,11 @@ BasePill {
     signal toggleLayoutPopup
 
     // mango shares dwl's tag/layout model; route to the right service.
-    readonly property bool isDwlLike: CompositorService.isDwl || CompositorService.isMango
-    readonly property var dwlSvc: CompositorService.isMango ? MangoService : DwlService
+    readonly property bool isMango: CompositorService.isMango
 
-    visible: layout.isDwlLike && layout.dwlSvc.available
+    visible: layout.isMango && MangoService.available
 
-    property var outputState: parentScreen ? layout.dwlSvc.getOutputState(parentScreen.name) : null
+    property var outputState: parentScreen ? MangoService.getOutputState(parentScreen.name) : null
     property string currentLayoutSymbol: outputState?.layoutSymbol || ""
     property int currentLayoutIndex: outputState?.layout || 0
 
@@ -41,9 +40,9 @@ BasePill {
     }
 
     Connections {
-        target: layout.dwlSvc
+        target: MangoService
         function onStateChanged() {
-            outputState = parentScreen ? layout.dwlSvc.getOutputState(parentScreen.name) : null;
+            outputState = parentScreen ? MangoService.getOutputState(parentScreen.name) : null;
         }
     }
 
@@ -101,13 +100,13 @@ BasePill {
     }
 
     onRightClicked: {
-        if (!parentScreen || !layout.dwlSvc.available || layout.dwlSvc.layouts.length === 0) {
+        if (!parentScreen || !MangoService.available || MangoService.layouts.length === 0) {
             return;
         }
 
         const currentIndex = layout.currentLayoutIndex;
-        const nextIndex = (currentIndex + 1) % layout.dwlSvc.layouts.length;
+        const nextIndex = (currentIndex + 1) % MangoService.layouts.length;
 
-        layout.dwlSvc.setLayout(parentScreen.name, nextIndex);
+        MangoService.setLayout(parentScreen.name, nextIndex);
     }
 }

quickshell/Modules/DankBar/Widgets/KeyboardLayoutName.qml

@@ -112,8 +112,6 @@ BasePill {
     property string currentLayout: {
         if (CompositorService.isNiri) {
             return NiriService.getCurrentKeyboardLayoutName();
-        } else if (CompositorService.isDwl) {
-            return DwlService.currentKeyboardLayout;
         } else if (CompositorService.isMango) {
             return MangoService.currentKeyboardLayout;
         }
@@ -209,8 +207,6 @@ BasePill {
                 NiriService.cycleKeyboardLayout();
             } else if (CompositorService.isHyprland) {
                 Quickshell.execDetached(["hyprctl", "switchxkblayout", root.hyprlandKeyboard, "next"]);
-            } else if (CompositorService.isDwl) {
-                Quickshell.execDetached(["mmsg", "dispatch", "switch_keyboard_layout"]);
             } else if (CompositorService.isMango) {
                 MangoService.cycleKeyboardLayout();
             }

quickshell/Modules/DankBar/Widgets/LauncherButton.qml

@@ -55,7 +55,7 @@ BasePill {
             }
 
             IconImage {
-                visible: SettingsData.launcherLogoMode === "compositor" && (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle || CompositorService.isLabwc)
+                visible: SettingsData.launcherLogoMode === "compositor" && (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle || CompositorService.isLabwc)
                 anchors.centerIn: parent
                 width: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
                 height: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
@@ -66,8 +66,6 @@ BasePill {
                         return "file://" + Theme.shellDir + "/assets/niri.svg";
                     } else if (CompositorService.isHyprland) {
                         return "file://" + Theme.shellDir + "/assets/hyprland.svg";
-                    } else if (CompositorService.isDwl) {
-                        return "file://" + Theme.shellDir + "/assets/mango.png";
                     } else if (CompositorService.isMango) {
                         return "file://" + Theme.shellDir + "/assets/mango.png";
                     } else if (CompositorService.isSway) {

quickshell/Modules/DankBar/Widgets/NotepadButton.qml

@@ -32,9 +32,20 @@ BasePill {
     }
 
     readonly property var notepadInstance: resolveNotepadInstance()
-    readonly property bool isActive: notepadInstance?.isVisible ?? false
+    readonly property bool popoutDefault: SettingsData.notepadDefaultMode === "popout"
+    readonly property bool isActive: popoutDefault ? (PopoutService.notepadPopout?.visible ?? false) : (notepadInstance?.isVisible ?? false)
     property bool isAutoHideBar: false
 
+    function showActiveSurface() {
+        if (root.popoutDefault) {
+            PopoutService.openNotepadPopout();
+            return;
+        }
+        const instance = prepareNotepadInstance(root.notepadInstance);
+        if (instance && typeof instance.show === "function")
+            instance.show();
+    }
+
     function prepareNotepadInstance(instance) {
         if (instance)
             instance.triggerUsesOverlayLayer = root.barUsesOverlayLayer;
@@ -75,20 +86,14 @@ BasePill {
     function openTabByIndex(tabIndex) {
         if (tabIndex < 0)
             return;
-        const instance = prepareNotepadInstance(root.notepadInstance);
-        if (instance && typeof instance.show === "function") {
-            instance.show();
-        }
+        showActiveSurface();
         Qt.callLater(() => {
             NotepadStorageService.switchToTab(tabIndex);
         });
     }
 
     function openNewNote() {
-        const instance = prepareNotepadInstance(root.notepadInstance);
-        if (instance && typeof instance.show === "function") {
-            instance.show();
-        }
+        showActiveSurface();
         Qt.callLater(() => {
             NotepadStorageService.createNewTab();
         });
@@ -147,6 +152,10 @@ BasePill {
                 openContextMenu();
                 return;
             }
+            if (root.popoutDefault) {
+                PopoutService.toggleNotepadPopout();
+                return;
+            }
             const inst = prepareNotepadInstance(root.notepadInstance);
             if (inst) {
                 inst.toggle();

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -22,6 +22,10 @@ BasePill {
     property bool isAtBottom: false
     property bool isAutoHideBar: false
     property bool useOverflowPopup: !widgetData?.trayUseInlineExpansion
+    property bool useSingleLineOverflowPopup: widgetData?.trayPopupSingleLine ?? SettingsData.trayPopupSingleLine
+    property bool useAutomaticOverflow: widgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow
+    property int configuredMaxVisibleItems: widgetData?.trayMaxVisibleItems ?? SettingsData.trayMaxVisibleItems
+    property real sectionAvailablePrimarySize: 0
     readonly property var hiddenTrayIds: {
         const envValue = Quickshell.env("DMS_HIDE_TRAYIDS") || "";
         return envValue ? envValue.split(",").map(id => id.trim().toLowerCase()) : [];
@@ -146,12 +150,32 @@ BasePill {
 
     readonly property var allSortedTrayItems: sortByPreferredOrder(allTrayItems, _trayOrderTrigger)
     readonly property var allSortedTrayItemKeys: allSortedTrayItems.map(item => getTrayItemKey(item))
-    readonly property var mainBarItemsRaw: allSortedTrayItems.filter(item => !SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
+    readonly property var visibleSortedTrayItems: allSortedTrayItems.filter(item => !SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
+    readonly property int automaticVisibleItemLimit: {
+        if (!root.useAutomaticOverflow)
+            return root.visibleSortedTrayItems.length;
+
+        const explicitLimit = Number(root.configuredMaxVisibleItems || 0);
+        if (explicitLimit > 0)
+            return Math.max(1, Math.min(root.visibleSortedTrayItems.length, explicitLimit));
+
+        const scale = (typeof CompositorService !== "undefined" && CompositorService.getScreenScale) ? Math.max(1, CompositorService.getScreenScale(root.parentScreen)) : 1;
+        const sectionPrimary = root.sectionAvailablePrimarySize > 0 ? root.sectionAvailablePrimarySize : (root.isVerticalOrientation ? (root.parentScreen?.height || 0) : (root.parentScreen?.width || 0));
+        const logicalPrimary = sectionPrimary > 0 ? (sectionPrimary / scale) : 640;
+        const maxTrayShare = root.isVerticalOrientation ? 0.55 : 0.50;
+        const itemSize = Math.max(1, root.trayItemSize);
+        const slots = Math.floor((logicalPrimary * maxTrayShare) / itemSize);
+        return Math.max(2, Math.min(10, Math.min(root.visibleSortedTrayItems.length, slots)));
+    }
+    readonly property var mainBarItemsRaw: visibleSortedTrayItems.slice(0, automaticVisibleItemLimit)
     readonly property var mainBarItems: mainBarItemsRaw.map((item, idx) => ({
                 key: getTrayItemKey(item),
                 item: item
             }))
-    readonly property var hiddenBarItems: allSortedTrayItems.filter(item => SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
+    readonly property var autoOverflowBarItems: visibleSortedTrayItems.slice(automaticVisibleItemLimit)
+    readonly property var manualHiddenBarItems: allSortedTrayItems.filter(item => SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
+    readonly property var hiddenBarItemKeys: manualHiddenBarItems.concat(autoOverflowBarItems).map(item => root.getTrayItemKey(item))
+    readonly property var hiddenBarItems: allSortedTrayItems.filter(item => hiddenBarItemKeys.indexOf(root.getTrayItemKey(item)) !== -1)
     readonly property string trayIconTintMode: {
         const configuredMode = SettingsData.systemTrayIconTintMode || "none";
         switch (configuredMode) {
@@ -219,6 +243,10 @@ BasePill {
 
         const fromKey = mainBarItems[visibleFromIndex]?.key ?? null;
         const toKey = mainBarItems[visibleToIndex]?.key ?? null;
+        moveTrayItemKeyInFullOrder(fromKey, toKey);
+    }
+
+    function moveTrayItemKeyInFullOrder(fromKey, toKey) {
         if (!fromKey || !toKey)
             return;
 
@@ -233,10 +261,103 @@ BasePill {
         SessionData.setTrayItemOrder(fullOrder);
     }
 
+    function promoteTrayItemToBar(item) {
+        const itemKey = getTrayItemKey(item);
+        if (!itemKey)
+            return;
+        if (SessionData.isHiddenTrayId(itemKey)) {
+            SessionData.showTrayId(itemKey);
+            return;
+        }
+
+        const fullOrder = [...allSortedTrayItemKeys];
+        const fromIndex = fullOrder.indexOf(itemKey);
+        if (fromIndex < 0)
+            return;
+        const movedKey = fullOrder.splice(fromIndex, 1)[0];
+        const targetIndex = Math.max(0, Math.min(root.automaticVisibleItemLimit - 1, fullOrder.length));
+        fullOrder.splice(targetIndex, 0, movedKey);
+        SessionData.setTrayItemOrder(fullOrder);
+    }
+
+    function isManualHiddenTrayItem(item) {
+        return SessionData.isHiddenTrayId(getTrayItemKey(item));
+    }
+
+    function isAutoOverflowTrayItem(item) {
+        const key = getTrayItemKey(item);
+        return key && !isManualHiddenTrayItem(item) && root.autoOverflowBarItems.some(overflowItem => getTrayItemKey(overflowItem) === key);
+    }
+
+    function dragShiftOffset(index, draggedIndex, dropTargetIndex, shiftAmount) {
+        if (draggedIndex < 0 || index === draggedIndex || dropTargetIndex < 0)
+            return 0;
+        if (draggedIndex < dropTargetIndex && index > draggedIndex && index <= dropTargetIndex)
+            return -shiftAmount;
+        if (draggedIndex > dropTargetIndex && index >= dropTargetIndex && index < draggedIndex)
+            return shiftAmount;
+        return 0;
+    }
+
+    function beginMainDrag(visualIndex, reversed) {
+        root.draggedIndex = reversed ? (root.mainBarItems.length - 1 - visualIndex) : visualIndex;
+        root.dropTargetIndex = root.draggedIndex;
+    }
+
+    function updateMainDrag(axisOffset, visualIndex, reversed) {
+        const itemSize = root.trayItemSize;
+        const slotOffset = Math.round(axisOffset / itemSize);
+        const visualTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, visualIndex + slotOffset));
+        const newTargetIndex = reversed ? (root.mainBarItems.length - 1 - visualTargetIndex) : visualTargetIndex;
+        if (newTargetIndex !== root.dropTargetIndex)
+            root.dropTargetIndex = newTargetIndex;
+    }
+
+    function finishMainDrag() {
+        const didReorder = root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
+        if (didReorder) {
+            root.suppressShiftAnimation = true;
+            root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
+            Qt.callLater(() => root.suppressShiftAnimation = false);
+        }
+        root.draggedIndex = -1;
+        root.dropTargetIndex = -1;
+        return didReorder;
+    }
+
+    function beginPopupDrag(index) {
+        root.popupDraggedIndex = index;
+        root.popupDropTargetIndex = index;
+    }
+
+    function updatePopupDrag(axisOffset, index) {
+        const itemSize = root.trayItemSize + 6;
+        const slotOffset = Math.round(axisOffset / itemSize);
+        const newTargetIndex = Math.max(0, Math.min(root.hiddenBarItems.length - 1, index + slotOffset));
+        if (newTargetIndex !== root.popupDropTargetIndex)
+            root.popupDropTargetIndex = newTargetIndex;
+    }
+
+    function finishPopupDrag() {
+        const didReorder = root.popupDropTargetIndex >= 0 && root.popupDropTargetIndex !== root.popupDraggedIndex;
+        if (didReorder) {
+            const fromItem = root.hiddenBarItems[root.popupDraggedIndex];
+            const toItem = root.hiddenBarItems[root.popupDropTargetIndex];
+            root.suppressShiftAnimation = true;
+            root.moveTrayItemKeyInFullOrder(root.getTrayItemKey(fromItem), root.getTrayItemKey(toItem));
+            Qt.callLater(() => root.suppressShiftAnimation = false);
+        }
+        root.popupDraggedIndex = -1;
+        root.popupDropTargetIndex = -1;
+        return didReorder;
+    }
+
     property int draggedIndex: -1
     property int dropTargetIndex: -1
+    property int popupDraggedIndex: -1
+    property int popupDropTargetIndex: -1
     property bool suppressShiftAnimation: false
-    readonly property bool hasHiddenItems: allTrayItems.length > mainBarItems.length
+    readonly property bool hasHiddenItems: hiddenBarItems.length > 0
     readonly property bool inlineExpanded: hasHiddenItems && !useOverflowPopup && menuOpen
     visible: allTrayItems.length > 0
     opacity: allTrayItems.length > 0 ? 1 : 0
@@ -351,22 +472,7 @@ BasePill {
                     height: root.barThickness
                     z: dragHandler.dragging ? 100 : 0
 
-                    property real shiftOffset: {
-                        if (root.draggedIndex < 0)
-                            return 0;
-                        if (index === root.draggedIndex)
-                            return 0;
-                        const dragIdx = root.draggedIndex;
-                        const dropIdx = root.dropTargetIndex;
-                        const shiftAmount = root.trayItemSize;
-                        if (dropIdx < 0)
-                            return 0;
-                        if (dragIdx < dropIdx && index > dragIdx && index <= dropIdx)
-                            return -shiftAmount;
-                        if (dragIdx > dropIdx && index >= dropIdx && index < dragIdx)
-                            return shiftAmount;
-                        return 0;
-                    }
+                    property real shiftOffset: root.dragShiftOffset(index, root.draggedIndex, root.dropTargetIndex, root.trayItemSize)
 
                     transform: Translate {
                         x: delegateRoot.shiftOffset
@@ -466,19 +572,12 @@ BasePill {
                         onReleased: mouse => {
                             longPressTimer.stop();
                             const wasDragging = dragHandler.dragging;
-                            const didReorder = wasDragging && root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
-
-                            if (didReorder) {
-                                root.suppressShiftAnimation = true;
-                                root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
-                                Qt.callLater(() => root.suppressShiftAnimation = false);
-                            }
+                            if (wasDragging)
+                                root.finishMainDrag();
 
                             dragHandler.longPressing = false;
                             dragHandler.dragging = false;
                             dragHandler.dragAxisOffset = 0;
-                            root.draggedIndex = -1;
-                            root.dropTargetIndex = -1;
 
                             if (wasDragging || mouse.button !== Qt.LeftButton)
                                 return;
@@ -501,8 +600,7 @@ BasePill {
                                 const distance = Math.abs(mouse.x - dragHandler.dragStartPos.x);
                                 if (distance > 5) {
                                     dragHandler.dragging = true;
-                                    root.draggedIndex = root.reverseInlineHorizontal ? (root.mainBarItems.length - 1 - index) : index;
-                                    root.dropTargetIndex = root.draggedIndex;
+                                    root.beginMainDrag(index, root.reverseInlineHorizontal);
                                 }
                             }
                             if (!dragHandler.dragging)
@@ -510,13 +608,7 @@ BasePill {
 
                             const axisOffset = mouse.x - dragHandler.dragStartPos.x;
                             dragHandler.dragAxisOffset = axisOffset;
-                            const itemSize = root.trayItemSize;
-                            const slotOffset = Math.round(axisOffset / itemSize);
-                            const visualTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
-                            const newTargetIndex = root.reverseInlineHorizontal ? (root.mainBarItems.length - 1 - visualTargetIndex) : visualTargetIndex;
-                            if (newTargetIndex !== root.dropTargetIndex) {
-                                root.dropTargetIndex = newTargetIndex;
-                            }
+                            root.updateMainDrag(axisOffset, index, root.reverseInlineHorizontal);
                         }
 
                         onClicked: mouse => {
@@ -706,22 +798,7 @@ BasePill {
             height: root.trayItemSize
             z: dragHandler.dragging ? 100 : 0
 
-            property real shiftOffset: {
-                if (root.draggedIndex < 0)
-                    return 0;
-                if (index === root.draggedIndex)
-                    return 0;
-                const dragIdx = root.draggedIndex;
-                const dropIdx = root.dropTargetIndex;
-                const shiftAmount = root.trayItemSize;
-                if (dropIdx < 0)
-                    return 0;
-                if (dragIdx < dropIdx && index > dragIdx && index <= dropIdx)
-                    return -shiftAmount;
-                if (dragIdx > dropIdx && index >= dropIdx && index < dragIdx)
-                    return shiftAmount;
-                return 0;
-            }
+            property real shiftOffset: root.dragShiftOffset(index, root.draggedIndex, root.dropTargetIndex, root.trayItemSize)
 
             transform: Translate {
                 y: shiftOffset
@@ -821,19 +898,12 @@ BasePill {
                 onReleased: mouse => {
                     longPressTimer.stop();
                     const wasDragging = dragHandler.dragging;
-                    const didReorder = wasDragging && root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
-
-                    if (didReorder) {
-                        root.suppressShiftAnimation = true;
-                        root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
-                        Qt.callLater(() => root.suppressShiftAnimation = false);
-                    }
+                    if (wasDragging)
+                        root.finishMainDrag();
 
                     dragHandler.longPressing = false;
                     dragHandler.dragging = false;
                     dragHandler.dragAxisOffset = 0;
-                    root.draggedIndex = -1;
-                    root.dropTargetIndex = -1;
 
                     if (wasDragging || mouse.button !== Qt.LeftButton)
                         return;
@@ -856,8 +926,7 @@ BasePill {
                         const distance = Math.abs(mouse.y - dragHandler.dragStartPos.y);
                         if (distance > 5) {
                             dragHandler.dragging = true;
-                            root.draggedIndex = index;
-                            root.dropTargetIndex = root.draggedIndex;
+                            root.beginMainDrag(index, false);
                         }
                     }
                     if (!dragHandler.dragging)
@@ -865,12 +934,7 @@ BasePill {
 
                     const axisOffset = mouse.y - dragHandler.dragStartPos.y;
                     dragHandler.dragAxisOffset = axisOffset;
-                    const itemSize = root.trayItemSize;
-                    const slotOffset = Math.round(axisOffset / itemSize);
-                    const newTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
-                    if (newTargetIndex !== root.dropTargetIndex) {
-                        root.dropTargetIndex = newTargetIndex;
-                    }
+                    root.updateMainDrag(axisOffset, index, false);
                 }
 
                 onClicked: mouse => {
@@ -1115,11 +1179,12 @@ BasePill {
         }
 
         function updatePosition() {
-            const globalPos = root.mapToGlobal(0, 0);
-            const screenX = screen.x || 0;
-            const screenY = screen.y || 0;
-            const relativeX = globalPos.x - screenX;
-            const relativeY = globalPos.y - screenY;
+            // Window-local maps directly to screen-local because the bar window spans the
+            // full screen edge; this avoids mixing mapToGlobal with a separately-tracked
+            // screen.x/.y origin, which desync on non-primary monitors and after DPMS/hotplug.
+            const localPos = root.mapToItem(null, 0, 0);
+            const relativeX = localPos.x;
+            const relativeY = localPos.y;
 
             if (root.isVerticalOrientation) {
                 const edge = root.axis?.edge;
@@ -1136,20 +1201,38 @@ BasePill {
             id: menuContainer
             objectName: "overflowMenuContainer"
 
+            readonly property bool popupUsesVerticalLine: root.useSingleLineOverflowPopup && root.isVerticalOrientation
+            readonly property real popupPadding: Theme.spacingS + (popupUsesVerticalLine ? 3 : 0)
+
             readonly property real rawWidth: {
                 const itemCount = root.hiddenBarItems.length;
-                const cols = Math.min(5, itemCount);
+                if (itemCount === 0)
+                    return 0;
+                if (popupUsesVerticalLine)
+                    return root.trayItemSize + 4 + popupPadding * 2;
+                const cols = root.useSingleLineOverflowPopup ? itemCount : Math.min(5, itemCount);
                 const itemSize = root.trayItemSize + 4;
                 const spacing = 2;
-                return cols * itemSize + (cols - 1) * spacing + Theme.spacingS * 2;
+                const desiredWidth = cols * itemSize + (cols - 1) * spacing + popupPadding * 2;
+                if (!root.useSingleLineOverflowPopup)
+                    return desiredWidth;
+                const maxWidth = Math.max(itemSize + popupPadding * 2, overflowMenu.maskWidth - 20);
+                return Math.min(desiredWidth, maxWidth);
             }
             readonly property real rawHeight: {
                 const itemCount = root.hiddenBarItems.length;
-                const cols = Math.min(5, itemCount);
-                const rows = Math.ceil(itemCount / cols);
+                if (itemCount === 0)
+                    return 0;
                 const itemSize = root.trayItemSize + 4;
                 const spacing = 2;
-                return rows * itemSize + (rows - 1) * spacing + Theme.spacingS * 2;
+                if (popupUsesVerticalLine) {
+                    const desiredHeight = itemCount * itemSize + (itemCount - 1) * spacing + popupPadding * 2;
+                    const maxHeight = Math.max(itemSize + popupPadding * 2, overflowMenu.maskHeight - 20);
+                    return Math.min(desiredHeight, maxHeight);
+                }
+                const cols = root.useSingleLineOverflowPopup ? itemCount : Math.min(5, itemCount);
+                const rows = Math.ceil(itemCount / cols);
+                return rows * itemSize + (rows - 1) * spacing + popupPadding * 2;
             }
 
             readonly property real alignedWidth: Theme.px(rawWidth, overflowMenu.dpr)
@@ -1230,76 +1313,161 @@ BasePill {
                 z: 100
             }
 
-            Grid {
-                id: menuGrid
+            Flickable {
                 anchors.centerIn: parent
-                columns: Math.min(5, root.hiddenBarItems.length)
-                spacing: 2
-                rowSpacing: 2
+                width: parent.width - menuContainer.popupPadding * 2
+                height: parent.height - menuContainer.popupPadding * 2
+                contentWidth: menuGrid.implicitWidth
+                contentHeight: menuGrid.implicitHeight
+                boundsBehavior: Flickable.StopAtBounds
+                clip: true
+                interactive: root.useSingleLineOverflowPopup && (menuContainer.popupUsesVerticalLine ? contentHeight > height : contentWidth > width)
 
-                Repeater {
-                    model: root.hiddenBarItems
+                Grid {
+                    id: menuGrid
+                    anchors.verticalCenter: menuContainer.popupUsesVerticalLine ? undefined : parent.verticalCenter
+                    anchors.horizontalCenter: menuContainer.popupUsesVerticalLine ? parent.horizontalCenter : undefined
+                    columns: menuContainer.popupUsesVerticalLine ? 1 : (root.useSingleLineOverflowPopup ? root.hiddenBarItems.length : Math.min(5, root.hiddenBarItems.length))
+                    spacing: 2
+                    rowSpacing: 2
 
-                    delegate: Rectangle {
-                        property var trayItem: modelData
-                        property string iconSource: root.trayIconSourceFor(trayItem)
+                    Repeater {
+                        model: root.hiddenBarItems
 
-                        width: root.trayItemSize + 4
-                        height: root.trayItemSize + 4
-                        radius: Theme.cornerRadius
-                        color: itemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : Theme.withAlpha(Theme.surfaceContainer, 0)
+                        delegate: Rectangle {
+                            id: overflowItemRoot
+                            property var trayItem: modelData
+                            property string itemKey: root.getTrayItemKey(trayItem)
+                            property string iconSource: root.trayIconSourceFor(trayItem)
 
-                        IconImage {
-                            id: menuIconImg
-                            anchors.centerIn: parent
-                            width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                            height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                            source: parent.iconSource
-                            asynchronous: true
-                            smooth: true
-                            mipmap: true
-                            visible: status === Image.Ready
-                            layer.enabled: root.trayIconTintEnabled
-                            layer.effect: MultiEffect {
-                                saturation: root.trayIconSaturation
-                                colorization: root.trayIconColorization
-                                colorizationColor: root.trayIconTintColor
-                            }
-                        }
+                            width: root.trayItemSize + 4
+                            height: root.trayItemSize + 4
+                            z: popupDragHandler.dragging ? 100 : 0
+                            radius: Theme.cornerRadius
+                            color: itemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : Theme.withAlpha(Theme.surfaceContainer, 0)
+                            border.width: popupDragHandler.dragging ? 2 : 0
+                            border.color: Theme.primary
+                            opacity: popupDragHandler.dragging ? 0.8 : 1.0
 
-                        StyledText {
-                            anchors.centerIn: parent
-                            visible: !menuIconImg.visible
-                            text: {
-                                const itemId = trayItem?.id || "";
-                                if (!itemId)
-                                    return "?";
-                                return itemId.charAt(0).toUpperCase();
-                            }
-                            font.pixelSize: 10
-                            color: Theme.widgetTextColor
-                        }
+                            property real shiftOffset: root.dragShiftOffset(index, root.popupDraggedIndex, root.popupDropTargetIndex, root.trayItemSize + 6)
 
-                        MouseArea {
-                            id: itemArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            acceptedButtons: Qt.LeftButton | Qt.RightButton
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: mouse => {
-                                if (!trayItem)
-                                    return;
-                                if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                                    trayItem.activate();
-                                    root.menuOpen = false;
-                                    return;
+                            transform: Translate {
+                                x: !menuContainer.popupUsesVerticalLine ? overflowItemRoot.shiftOffset + (popupDragHandler.dragging ? popupDragHandler.dragAxisOffset : 0) : 0
+                                y: menuContainer.popupUsesVerticalLine ? overflowItemRoot.shiftOffset + (popupDragHandler.dragging ? popupDragHandler.dragAxisOffset : 0) : 0
+                                Behavior on x {
+                                    enabled: !root.suppressShiftAnimation && !menuContainer.popupUsesVerticalLine
+                                    NumberAnimation {
+                                        duration: 150
+                                        easing.type: Easing.OutCubic
+                                    }
                                 }
-                                if (!trayItem.hasMenu) {
-                                    const gp = itemArea.mapToGlobal(mouse.x, mouse.y);
-                                    root.callContextMenuFallback(trayItem.id, Math.round(gp.x), Math.round(gp.y));
-                                    return;
+                                Behavior on y {
+                                    enabled: !root.suppressShiftAnimation && menuContainer.popupUsesVerticalLine
+                                    NumberAnimation {
+                                        duration: 150
+                                        easing.type: Easing.OutCubic
+                                    }
+                                }
+                            }
+
+                            Item {
+                                id: popupDragHandler
+                                anchors.fill: parent
+                                property bool dragging: false
+                                property point dragStartPos: Qt.point(0, 0)
+                                property real dragAxisOffset: 0
+                                property bool longPressing: false
+
+                                Timer {
+                                    id: popupLongPressTimer
+                                    interval: 400
+                                    repeat: false
+                                    onTriggered: popupDragHandler.longPressing = true
+                                }
+                            }
+
+                            IconImage {
+                                id: menuIconImg
+                                anchors.centerIn: parent
+                                width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                                height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                                source: parent.iconSource
+                                asynchronous: true
+                                smooth: true
+                                mipmap: true
+                                visible: status === Image.Ready
+                                layer.enabled: root.trayIconTintEnabled
+                                layer.effect: MultiEffect {
+                                    saturation: root.trayIconSaturation
+                                    colorization: root.trayIconColorization
+                                    colorizationColor: root.trayIconTintColor
+                                }
+                            }
+
+                            StyledText {
+                                anchors.centerIn: parent
+                                visible: !menuIconImg.visible
+                                text: {
+                                    const itemId = trayItem?.id || "";
+                                    if (!itemId)
+                                        return "?";
+                                    return itemId.charAt(0).toUpperCase();
+                                }
+                                font.pixelSize: 10
+                                color: Theme.widgetTextColor
+                            }
+
+                            MouseArea {
+                                id: itemArea
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                                cursorShape: popupDragHandler.longPressing ? Qt.DragMoveCursor : Qt.PointingHandCursor
+                                onPressed: mouse => {
+                                    if (mouse.button === Qt.LeftButton) {
+                                        popupDragHandler.dragStartPos = Qt.point(mouse.x, mouse.y);
+                                        popupLongPressTimer.start();
+                                    }
+                                }
+                                onReleased: mouse => {
+                                    popupLongPressTimer.stop();
+                                    const wasDragging = popupDragHandler.dragging;
+                                    if (wasDragging)
+                                        root.finishPopupDrag();
+
+                                    popupDragHandler.longPressing = false;
+                                    popupDragHandler.dragging = false;
+                                    popupDragHandler.dragAxisOffset = 0;
+                                }
+                                onPositionChanged: mouse => {
+                                    const axisDelta = menuContainer.popupUsesVerticalLine ? (mouse.y - popupDragHandler.dragStartPos.y) : (mouse.x - popupDragHandler.dragStartPos.x);
+                                    if (popupDragHandler.longPressing && !popupDragHandler.dragging && Math.abs(axisDelta) > 5) {
+                                        popupDragHandler.dragging = true;
+                                        root.beginPopupDrag(index);
+                                    }
+                                    if (!popupDragHandler.dragging)
+                                        return;
+
+                                    popupDragHandler.dragAxisOffset = axisDelta;
+                                    root.updatePopupDrag(axisDelta, index);
+                                }
+                                onClicked: mouse => {
+                                    if (popupDragHandler.dragging)
+                                        return;
+                                    if (!trayItem)
+                                        return;
+                                    if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
+                                        trayItem.activate();
+                                        root.menuOpen = false;
+                                        return;
+                                    }
+                                    if (!trayItem.hasMenu) {
+                                        const gp = itemArea.mapToGlobal(mouse.x, mouse.y);
+                                        root.callContextMenuFallback(trayItem.id, Math.round(gp.x), Math.round(gp.y));
+                                        return;
+                                    }
+                                    root.showForTrayItem(trayItem, menuContainer, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                                 }
-                                root.showForTrayItem(trayItem, menuContainer, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                             }
                         }
                     }
@@ -1555,11 +1723,13 @@ BasePill {
                             anchorPos = Qt.point(targetX, targetY);
                         }
                     } else {
-                        const globalPos = targetItem.mapToGlobal(0, 0);
-                        const screenX = screen.x || 0;
-                        const screenY = screen.y || 0;
-                        const relativeX = globalPos.x - screenX;
-                        const relativeY = globalPos.y - screenY;
+                        // Window-local maps directly to screen-local because the bar window spans
+                        // the full screen edge; this avoids mixing mapToGlobal with a separately-
+                        // tracked screen.x/.y origin, which desync on non-primary monitors and after
+                        // DPMS/hotplug.
+                        const localPos = targetItem.mapToItem(null, 0, 0);
+                        const relativeX = localPos.x;
+                        const relativeY = localPos.y;
 
                         if (menuRoot.isVertical) {
                             const edge = menuRoot.axis?.edge;
@@ -1695,7 +1865,12 @@ BasePill {
                                 anchors.left: parent.left
                                 anchors.leftMargin: Theme.spacingS
                                 anchors.verticalCenter: parent.verticalCenter
-                                text: menuRoot.trayItem?.id || "Unknown"
+                                text: {
+                                    const itemId = menuRoot.trayItem?.id || "Unknown";
+                                    if (root.isAutoOverflowTrayItem(menuRoot.trayItem))
+                                        return itemId + " · " + I18n.tr("Keep in Bar");
+                                    return itemId;
+                                }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Theme.surfaceTextMedium
                                 elide: Text.ElideMiddle
@@ -1706,7 +1881,11 @@ BasePill {
                                 anchors.right: parent.right
                                 anchors.rightMargin: Theme.spacingS
                                 anchors.verticalCenter: parent.verticalCenter
-                                name: SessionData.isHiddenTrayId(root.getTrayItemKey(menuRoot.trayItem)) ? "visibility" : "visibility_off"
+                                name: {
+                                    if (root.isAutoOverflowTrayItem(menuRoot.trayItem))
+                                        return "push_pin";
+                                    return root.isManualHiddenTrayItem(menuRoot.trayItem) ? "visibility" : "visibility_off";
+                                }
                                 size: 16
                                 color: Theme.widgetTextColor
                             }
@@ -1720,7 +1899,9 @@ BasePill {
                                     const itemKey = root.getTrayItemKey(menuRoot.trayItem);
                                     if (!itemKey)
                                         return;
-                                    if (SessionData.isHiddenTrayId(itemKey)) {
+                                    if (root.isAutoOverflowTrayItem(menuRoot.trayItem)) {
+                                        root.promoteTrayItemToBar(menuRoot.trayItem);
+                                    } else if (root.isManualHiddenTrayItem(menuRoot.trayItem)) {
                                         SessionData.showTrayId(itemKey);
                                     } else {
                                         SessionData.hideTrayId(itemKey);

quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -22,10 +22,7 @@ Item {
     property var hyprlandOverviewLoader: null
     property var parentScreen: null
 
-    // mango shares dwl's tag model; route to the right service so one set of
-    // branches serves both.
-    readonly property bool isDwlLike: CompositorService.isDwl || CompositorService.isMango
-    readonly property var dwlSvc: CompositorService.isMango ? MangoService : DwlService
+    readonly property bool isMango: CompositorService.isMango
 
     readonly property real _leftMargin: {
         if (isVertical)
@@ -80,9 +77,8 @@ Item {
             return NiriService.currentOutput || root.screenName;
         case "hyprland":
             return Hyprland.focusedWorkspace?.monitor?.name || root.screenName;
-        case "dwl":
         case "mango":
-            return root.dwlSvc.activeOutput || root.screenName;
+            return MangoService.activeOutput || root.screenName;
         case "sway":
         case "scroll":
         case "miracle":
@@ -101,7 +97,6 @@ Item {
         switch (CompositorService.compositor) {
         case "niri":
         case "hyprland":
-        case "dwl":
         case "mango":
         case "sway":
         case "scroll":
@@ -128,7 +123,6 @@ Item {
             return getNiriActiveWorkspace();
         case "hyprland":
             return getHyprlandActiveWorkspace();
-        case "dwl":
         case "mango":
             const activeTags = getDwlActiveTags();
             return activeTags.length > 0 ? activeTags[0] : -1;
@@ -141,7 +135,7 @@ Item {
         }
     }
     property var dwlActiveTags: {
-        if (root.isDwlLike) {
+        if (root.isMango) {
             return getDwlActiveTags();
         }
         return [];
@@ -160,9 +154,6 @@ Item {
         case "hyprland":
             baseList = getHyprlandWorkspaces();
             break;
-        case "dwl":
-            baseList = getDwlTags();
-            break;
         case "mango":
             if (root.mangoOverviewActive)
                 return [];
@@ -302,7 +293,7 @@ Item {
             }
         } else if (CompositorService.isHyprland) {
             targetWorkspaceId = ws.id !== undefined ? ws.id : ws;
-        } else if (root.isDwlLike) {
+        } else if (root.isMango) {
             if (typeof ws !== "object" || ws.tag === undefined) {
                 return [];
             }
@@ -322,8 +313,8 @@ Item {
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             isActiveWs = focusedWs ? (focusedWs.num === targetWorkspaceId) : false;
-        } else if (root.isDwlLike) {
-            const output = root.dwlSvc.getOutputState(root.effectiveScreenName);
+        } else if (root.isMango) {
+            const output = MangoService.getOutputState(root.effectiveScreenName);
             if (output && output.tags) {
                 const tag = output.tags.find(t => t.tag === targetWorkspaceId);
                 isActiveWs = tag ? (tag.state === 1) : false;
@@ -411,7 +402,7 @@ Item {
                 "id": -1,
                 "name": ""
             };
-        } else if (root.isDwlLike) {
+        } else if (root.isMango) {
             placeholder = {
                 "tag": -1
             };
@@ -493,11 +484,11 @@ Item {
     }
 
     function getDwlTags() {
-        if (!root.dwlSvc.available)
+        if (!MangoService.available)
             return [];
 
         const targetScreen = root.effectiveScreenName;
-        const output = root.dwlSvc.getOutputState(targetScreen);
+        const output = MangoService.getOutputState(targetScreen);
         if (!output || !output.tags || output.tags.length === 0)
             return [];
 
@@ -510,7 +501,7 @@ Item {
                     }));
         }
 
-        const visibleTagIndices = root.dwlSvc.getVisibleTags(targetScreen);
+        const visibleTagIndices = MangoService.getVisibleTags(targetScreen);
         return visibleTagIndices.map(tagIndex => {
             const tagData = output.tags.find(t => t.tag === tagIndex);
             return {
@@ -523,10 +514,10 @@ Item {
     }
 
     function getDwlActiveTags() {
-        if (!root.dwlSvc.available)
+        if (!MangoService.available)
             return [];
 
-        return root.dwlSvc.getActiveTags(root.effectiveScreenName);
+        return MangoService.getActiveTags(root.effectiveScreenName);
     }
 
     function getExtWorkspaceWorkspaces() {
@@ -577,7 +568,7 @@ Item {
                 return ws && ws.idx !== -1;
             if (CompositorService.isHyprland)
                 return ws && ws.id !== -1;
-            if (root.isDwlLike)
+            if (root.isMango)
                 return ws && ws.tag !== -1;
             if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle)
                 return ws && ws.num !== -1;
@@ -605,10 +596,9 @@ Item {
                 HyprlandService.focusWorkspace(data.id);
             }
             break;
-        case "dwl":
         case "mango":
             if (data.tag !== undefined)
-                root.dwlSvc.switchToTag(root.screenName, data.tag);
+                MangoService.switchToTag(root.screenName, data.tag);
             break;
         case "sway":
         case "scroll":
@@ -694,7 +684,7 @@ Item {
             }
 
             HyprlandService.focusWorkspace(realWorkspaces[nextIndex].id);
-        } else if (root.isDwlLike) {
+        } else if (root.isMango) {
             const realWorkspaces = getRealWorkspaces();
             if (realWorkspaces.length < 2) {
                 return;
@@ -708,7 +698,7 @@ Item {
                 return;
             }
 
-            root.dwlSvc.switchToTag(root.screenName, realWorkspaces[nextIndex].tag);
+            MangoService.switchToTag(root.screenName, realWorkspaces[nextIndex].tag);
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             const realWorkspaces = getRealWorkspaces();
             if (realWorkspaces.length < 2) {
@@ -736,7 +726,7 @@ Item {
             return (modelData?.idx !== undefined && modelData?.idx !== -1) ? modelData.idx : "";
         if (CompositorService.isHyprland)
             return modelData?.id || "";
-        if (root.isDwlLike)
+        if (root.isMango)
             return (modelData?.tag !== undefined) ? (modelData.tag + 1) : "";
         if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle)
             return modelData?.num || "";
@@ -751,7 +741,7 @@ Item {
             isPlaceholder = modelData?.idx === -1;
         } else if (CompositorService.isHyprland) {
             isPlaceholder = modelData?.id === -1;
-        } else if (root.isDwlLike) {
+        } else if (root.isMango) {
             isPlaceholder = modelData?.tag === -1;
         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
             isPlaceholder = modelData?.num === -1;
@@ -786,7 +776,7 @@ Item {
         return getWorkspaceIndexFallback(modelData, index);
     }
 
-    readonly property bool hasNativeWorkspaceSupport: CompositorService.isNiri || CompositorService.isHyprland || root.isDwlLike || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle
+    readonly property bool hasNativeWorkspaceSupport: CompositorService.isNiri || CompositorService.isHyprland || root.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle
     readonly property bool hasWorkspaces: getRealWorkspaces().length > 0
     readonly property bool shouldShow: hasNativeWorkspaceSupport || (useExtWorkspace && hasWorkspaces)
 
@@ -1051,7 +1041,7 @@ Item {
                         return !!(modelData && modelData.idx === root.currentWorkspace);
                     if (CompositorService.isHyprland)
                         return !!(modelData && modelData.id === root.currentWorkspace);
-                    if (root.isDwlLike)
+                    if (root.isMango)
                         return !!(modelData && root.dwlActiveTags.includes(modelData.tag));
                     if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle)
                         return !!(modelData && modelData.num === root.currentWorkspace);
@@ -1060,7 +1050,7 @@ Item {
                 property bool isOccupied: {
                     if (CompositorService.isHyprland)
                         return Array.from(Hyprland.toplevels?.values || []).some(tl => tl.workspace?.id === modelData?.id);
-                    if (root.isDwlLike)
+                    if (root.isMango)
                         return modelData.clients > 0;
                     if (CompositorService.isNiri) {
                         const workspace = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.effectiveScreenName);
@@ -1075,7 +1065,7 @@ Item {
                         return !!(modelData && modelData.idx === -1);
                     if (CompositorService.isHyprland)
                         return !!(modelData && modelData.id === -1);
-                    if (root.isDwlLike)
+                    if (root.isMango)
                         return !!(modelData && modelData.tag === -1);
                     if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle)
                         return !!(modelData && modelData.num === -1);
@@ -1092,7 +1082,7 @@ Item {
                         return modelData?.urgent ?? false;
                     if (CompositorService.isNiri)
                         return loadedIsUrgent;
-                    if (root.isDwlLike)
+                    if (root.isMango)
                         return modelData?.state === 2;
                     if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle)
                         return loadedIsUrgent;
@@ -1120,7 +1110,7 @@ Item {
                         targetWorkspaceId = modelData?.id;
                     } else if (CompositorService.isHyprland) {
                         targetWorkspaceId = modelData?.id;
-                    } else if (root.isDwlLike) {
+                    } else if (root.isMango) {
                         targetWorkspaceId = modelData?.tag;
                     } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
                         targetWorkspaceId = modelData?.num;
@@ -1383,8 +1373,8 @@ Item {
                                 }
                             } else if (CompositorService.isHyprland && modelData?.id) {
                                 HyprlandService.focusWorkspace(modelData.id);
-                            } else if (root.isDwlLike && modelData?.tag !== undefined) {
-                                root.dwlSvc.switchToTag(root.screenName, modelData.tag);
+                            } else if (root.isMango && modelData?.tag !== undefined) {
+                                MangoService.switchToTag(root.screenName, modelData.tag);
                             } else if ((CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) && modelData?.num) {
                                 try {
                                     I3.dispatch(`workspace number ${modelData.num}`);
@@ -1395,8 +1385,8 @@ Item {
                                 NiriService.toggleOverview();
                             } else if (CompositorService.isHyprland && root.hyprlandOverviewLoader?.item) {
                                 root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen;
-                            } else if (root.isDwlLike && modelData?.tag !== undefined) {
-                                root.dwlSvc.toggleTag(root.screenName, modelData.tag);
+                            } else if (root.isMango && modelData?.tag !== undefined) {
+                                MangoService.toggleTag(root.screenName, modelData.tag);
                             }
                         }
                     }
@@ -1420,7 +1410,7 @@ Item {
                             wsData = modelData || null;
                         } else if (CompositorService.isHyprland) {
                             wsData = modelData;
-                        } else if (root.isDwlLike) {
+                        } else if (root.isMango) {
                             wsData = modelData;
                         } else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
                             wsData = modelData;
@@ -1434,7 +1424,7 @@ Item {
                         }
 
                         if (SettingsData.showWorkspaceApps) {
-                            if (root.isDwlLike || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
+                            if (root.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
                                 delegateRoot.loadedIcons = root.getWorkspaceIcons(modelData);
                             } else if (CompositorService.isNiri) {
                                 delegateRoot.loadedIcons = root.getWorkspaceIcons(isPlaceholder ? null : modelData);
@@ -1994,8 +1984,8 @@ Item {
                     }
                 }
                 Connections {
-                    target: root.dwlSvc
-                    enabled: root.isDwlLike
+                    target: MangoService
+                    enabled: root.isMango
                     function onStateChanged() {
                         delegateRoot.updateAllData();
                     }

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -108,9 +108,6 @@ DankPopout {
                 MprisController.setActivePlayer(player);
                 root.__hideDropdowns();
             }
-            onDeviceSelected: device => {
-                root.__hideDropdowns();
-            }
         }
     }
 
@@ -230,6 +227,13 @@ DankPopout {
                     return;
                 }
 
+                if (root.currentTabIndex === 0 && overviewLoader.item?.handleKeyEvent) {
+                    if (overviewLoader.item.handleKeyEvent(event)) {
+                        event.accepted = true;
+                        return;
+                    }
+                }
+
                 if (root.currentTabIndex === 1 && mediaLoader.item?.handleKeyEvent) {
                     if (mediaLoader.item.handleKeyEvent(event)) {
                         event.accepted = true;
@@ -359,6 +363,7 @@ DankPopout {
                         sourceComponent: Component {
                             OverviewTab {
                                 onCloseDash: root.dashVisible = false
+                                onNavFocusRequested: mainContainer.forceActiveFocus()
                                 onSwitchToWeatherTab: {
                                     if (SettingsData.weatherEnabled) {
                                         root.currentTabIndex = 3;

quickshell/Modules/DankDash/MediaDropdownOverlay.qml

@@ -383,7 +383,27 @@ Item {
                                 anchors.fill: parent
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
-                                onClicked: {
+                                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                                onPressed: mouse => {
+                                    if (mouse.button === Qt.RightButton) {
+                                        mouse.accepted = true;
+                                    }
+                                }
+                                onWheel: wheelEvent => {
+                                    if (SettingsData.audioDeviceScrollVolumeEnabled && wheelEvent.x >= deviceMouseArea.width / 2) {
+                                        AudioService.handleNodeVolumeWheel(modelData, wheelEvent);
+                                    } else {
+                                        wheelEvent.accepted = false;
+                                    }
+                                }
+                                onClicked: mouse => {
+                                    if (mouse.button === Qt.RightButton) {
+                                        if (modelData && modelData.audio) {
+                                            SessionData.suppressOSDTemporarily();
+                                            modelData.audio.muted = !modelData.audio.muted;
+                                        }
+                                        return;
+                                    }
                                     if (modelData && modelData.name) {
                                         AudioService.setDefaultSinkByName(modelData.name);
                                         root.deviceSelected(modelData);

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -866,7 +866,27 @@ Item {
             anchors.fill: parent
             hoverEnabled: true
             cursorShape: Qt.PointingHandCursor
-            onClicked: {
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+            onPressed: mouse => {
+                if (mouse.button === Qt.RightButton) {
+                    mouse.accepted = true;
+                }
+            }
+            onWheel: wheelEvent => {
+                const delta = wheelEvent.angleDelta.y;
+                if (delta !== 0) {
+                    AudioService.cycleAudioOutputDirection(delta < 0);
+                    wheelEvent.accepted = true;
+                }
+            }
+            onClicked: mouse => {
+                if (mouse.button === Qt.RightButton) {
+                    if (AudioService.sink?.audio) {
+                        SessionData.suppressOSDTemporarily();
+                        AudioService.sink.audio.muted = !AudioService.sink.audio.muted;
+                    }
+                    return;
+                }
                 if (devicesExpanded) {
                     const sinks = AudioService.getAvailableSinks();
                     if (sinks && sinks.length > 1) {

quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml

@@ -0,0 +1,311 @@
+import QtQuick
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    property var eventData: null
+    property bool canEdit: false
+
+    signal editRequested
+    signal deleteRequested
+    signal closeRequested
+
+    readonly property bool _descriptionIsHtml: /<[a-z][^>]*>/i.test((eventData && eventData.description) || "")
+
+    function _styleAnchors(html) {
+        return html.replace(/<a\s([^>]*)>/gi, (m, attrs) => {
+            const cleaned = attrs.replace(/style="[^"]*"/gi, "");
+            return "<a style=\"text-decoration:none; color:" + Theme.primary + ";\" " + cleaned + ">";
+        });
+    }
+
+    function _inlineMarkdown(line) {
+        let out = line.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        out = out.replace(/\\([\\`*_{}[\]()#+\-.!~>])/g, "$1");
+        out = out.replace(/(?:https?:\/\/|www\.)[^\s<>)\]]*[^\s<>)\].,;:!?"']/g, (m, offset, s) => {
+            const prev = offset > 0 ? s[offset - 1] : "";
+            if (prev === "(" || prev === "[" || prev === "\"" || prev === "'")
+                return m;
+            const href = m.startsWith("www.") ? "https://" + m : m;
+            return "<a href=\"" + href + "\">" + m + "</a>";
+        });
+        out = out.replace(/\[([^\]]+)\]\(([^()\s]+)\)/g, "<a href=\"$2\">$1</a>");
+        out = out.replace(/\*\*([^*]+)\*\*/g, "<b>$1</b>");
+        out = out.replace(/(^|[^*])\*([^*\s][^*]*)\*/g, "$1<i>$2</i>");
+        return out;
+    }
+
+    // Descriptions arrive as HTML (Google) or markdown/plain text; both render
+    // as RichText so links become clickable anchors recolored to the theme.
+    function _descriptionRichText() {
+        const raw = ((eventData && eventData.description) || "").trim();
+        if (raw === "")
+            return "";
+        if (_descriptionIsHtml)
+            return _styleAnchors(raw);
+
+        const parts = [];
+        let list = "";
+        const closeList = () => {
+            if (list === "")
+                return;
+            parts.push("</" + list + ">");
+            list = "";
+        };
+
+        const lines = raw.split("\n");
+        for (let i = 0; i < lines.length; i++) {
+            const ul = lines[i].match(/^\s*[-*+]\s+(.+)$/);
+            const ol = lines[i].match(/^\s*\d+[.)]\s+(.+)$/);
+            if (ul || ol) {
+                const tag = ul ? "ul" : "ol";
+                if (list !== tag) {
+                    closeList();
+                    parts.push("<" + tag + ">");
+                    list = tag;
+                }
+                parts.push("<li>" + _inlineMarkdown((ul || ol)[1]) + "</li>");
+                continue;
+            }
+            closeList();
+            parts.push(_inlineMarkdown(lines[i]) + "<br/>");
+        }
+        closeList();
+        return _styleAnchors(parts.join("").replace(/<br\/>$/, ""));
+    }
+
+    function _timeText() {
+        if (!eventData)
+            return "";
+        const dateStr = Qt.formatDate(eventData.start, "ddd, MMM d");
+        if (eventData.allDay)
+            return I18n.tr("All day") + " · " + dateStr;
+        const fmt = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
+        const startStr = Qt.formatTime(eventData.start, fmt);
+        if (eventData.start.getTime() === eventData.end.getTime())
+            return dateStr + " · " + startStr;
+        return dateStr + " · " + startStr + " – " + Qt.formatTime(eventData.end, fmt);
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        radius: Theme.cornerRadius
+        color: Qt.rgba(0, 0, 0, 0.45)
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.closeRequested()
+        }
+    }
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: Math.min(parent.width - Theme.spacingL * 2, 380)
+        height: Math.min(parent.height - Theme.spacingM * 2, body.implicitHeight + Theme.spacingL * 2)
+        radius: Theme.cornerRadius
+        color: Theme.surfaceContainerHigh
+        border.color: Theme.outlineMedium
+        border.width: 1
+        clip: true
+
+        MouseArea {
+            anchors.fill: parent
+        }
+
+        DankActionButton {
+            id: closeButton
+            anchors.top: parent.top
+            anchors.right: parent.right
+            anchors.margins: Theme.spacingXS
+            circular: false
+            iconName: "close"
+            iconSize: 16
+            z: 1
+            onClicked: root.closeRequested()
+        }
+
+        DankFlickable {
+            anchors.fill: parent
+            anchors.margins: Theme.spacingL
+            anchors.topMargin: Theme.spacingL
+            contentWidth: width
+            contentHeight: body.implicitHeight
+            clip: true
+
+            Column {
+                id: body
+                width: parent.width
+                spacing: Theme.spacingS
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    Rectangle {
+                        width: 4
+                        height: titleText.implicitHeight
+                        radius: 2
+                        anchors.top: parent.top
+                        color: (root.eventData && root.eventData.color) ? root.eventData.color : Theme.primary
+                    }
+
+                    StyledText {
+                        id: titleText
+                        width: parent.width - 4 - Theme.spacingS - closeButton.width
+                        text: root.eventData ? root.eventData.title : ""
+                        font.pixelSize: Theme.fontSizeLarge
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                        horizontalAlignment: Text.AlignLeft
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 3
+                        elide: Text.ElideRight
+                    }
+                }
+
+                StyledText {
+                    width: parent.width
+                    text: root._timeText()
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceVariantText
+                    wrapMode: Text.Wrap
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+                    visible: root.eventData && root.eventData.calendar
+
+                    DankIcon {
+                        name: "calendar_month"
+                        size: 14
+                        color: Theme.surfaceVariantText
+                        anchors.top: parent.top
+                        anchors.topMargin: 2
+                    }
+
+                    StyledText {
+                        width: parent.width - 14 - Theme.spacingXS
+                        text: {
+                            if (!root.eventData)
+                                return "";
+                            const acc = root.eventData.account || "";
+                            return root.eventData.calendar + (acc ? " · " + acc : "");
+                        }
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 2
+                        elide: Text.ElideRight
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+                    visible: root.eventData && root.eventData.location
+
+                    DankIcon {
+                        name: "place"
+                        size: 14
+                        color: Theme.surfaceVariantText
+                        anchors.top: parent.top
+                        anchors.topMargin: 2
+                    }
+
+                    StyledText {
+                        width: parent.width - 14 - Theme.spacingXS
+                        text: root.eventData ? root.eventData.location : ""
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 2
+                        elide: Text.ElideRight
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+                    visible: root.eventData && root.eventData.url
+
+                    DankIcon {
+                        name: "link"
+                        size: 14
+                        color: Theme.primary
+                        anchors.top: parent.top
+                        anchors.topMargin: 2
+                    }
+
+                    StyledText {
+                        width: parent.width - 14 - Theme.spacingXS
+                        text: root.eventData ? root.eventData.url : ""
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.primary
+                        wrapMode: Text.WrapAnywhere
+                        maximumLineCount: 2
+                        elide: Text.ElideRight
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                if (root.eventData && root.eventData.url)
+                                    Qt.openUrlExternally(root.eventData.url);
+                            }
+                        }
+                    }
+                }
+
+                StyledText {
+                    id: descriptionText
+                    width: parent.width
+                    text: root._descriptionRichText()
+                    visible: root.eventData && root.eventData.description
+                    textFormat: Text.RichText
+                    linkColor: Theme.primary
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceText
+                    horizontalAlignment: Text.AlignLeft
+                    wrapMode: Text.Wrap
+                    onLinkActivated: link => Qt.openUrlExternally(link)
+
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: descriptionText.hoveredLink !== "" ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: root.canEdit
+                    topPadding: Theme.spacingXS
+
+                    DankButton {
+                        text: I18n.tr("Edit")
+                        iconName: "edit"
+                        buttonHeight: 32
+                        onClicked: root.editRequested()
+                    }
+
+                    DankButton {
+                        text: I18n.tr("Delete")
+                        iconName: "delete"
+                        buttonHeight: 32
+                        backgroundColor: Theme.withAlpha(Theme.error, 0.15)
+                        textColor: Theme.error
+                        onClicked: root.deleteRequested()
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml

@@ -0,0 +1,350 @@
+import QtQuick
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    property var eventData: null
+    property date initialDate: new Date()
+
+    signal saved
+    signal closeRequested
+
+    property string fTitle: ""
+    property bool fAllDay: false
+    property date fDate: initialDate
+    property string fStart: "10:00"
+    property string fEnd: "11:00"
+    property string fLocation: ""
+    property string fDescription: ""
+    property string fCalendarId: ""
+    property int fReminder: -1
+    property string errorText: ""
+    property bool saving: false
+
+    readonly property var _cals: CalendarService.writableCalendars()
+    readonly property var _remLabels: [I18n.tr("No reminder"), I18n.tr("At start"), I18n.tr("5 min before"), I18n.tr("10 min before"), I18n.tr("15 min before"), I18n.tr("30 min before"), I18n.tr("1 hour before"), I18n.tr("1 day before")]
+    readonly property var _remMins: [-1, 0, 5, 10, 15, 30, 60, 1440]
+
+    function _parseTime(value) {
+        const m = value.trim().match(/^(\d{1,2}):(\d{2})$/);
+        if (!m)
+            return null;
+        const h = parseInt(m[1]);
+        const min = parseInt(m[2]);
+        if (h > 23 || min > 59)
+            return null;
+        return {
+            "h": h,
+            "m": min
+        };
+    }
+
+    function _isoFromDateTime(dateObj, h, m) {
+        const d = new Date(dateObj);
+        d.setHours(h, m, 0, 0);
+        return d.toISOString();
+    }
+
+    function _allDayIso(dateObj, dayOffset) {
+        return new Date(Date.UTC(dateObj.getFullYear(), dateObj.getMonth(), dateObj.getDate() + dayOffset)).toISOString();
+    }
+
+    function _calendarName(id) {
+        for (let i = 0; i < _cals.length; i++) {
+            if (_cals[i].id === id)
+                return _cals[i].name;
+        }
+        return _cals.length > 0 ? _cals[0].name : "";
+    }
+
+    function save() {
+        const title = fTitle.trim();
+        if (!title) {
+            errorText = I18n.tr("Title is required");
+            return;
+        }
+        let calId = fCalendarId;
+        if (!calId) {
+            const def = CalendarService.defaultCalendar();
+            calId = def ? def.id : "";
+        }
+        if (!calId) {
+            errorText = I18n.tr("No writable calendar available");
+            return;
+        }
+        let startIso, endIso;
+        if (fAllDay) {
+            startIso = _allDayIso(fDate, 0);
+            endIso = _allDayIso(fDate, 1);
+        } else {
+            const s = _parseTime(fStart);
+            const e = _parseTime(fEnd);
+            if (!s || !e) {
+                errorText = I18n.tr("Use HH:MM time format");
+                return;
+            }
+            startIso = _isoFromDateTime(fDate, s.h, s.m);
+            endIso = _isoFromDateTime(fDate, e.h, e.m);
+            if (new Date(endIso).getTime() <= new Date(startIso).getTime()) {
+                errorText = I18n.tr("End must be after start");
+                return;
+            }
+        }
+        const fields = {
+            "calendarId": calId,
+            "summary": title,
+            "description": fDescription,
+            "location": fLocation,
+            "start": startIso,
+            "end": endIso,
+            "allDay": fAllDay,
+            "reminders": fReminder >= 0 ? [
+                {
+                    "method": "popup",
+                    "minutes": fReminder
+                }
+            ] : []
+        };
+        saving = true;
+        errorText = "";
+        const cb = response => {
+            saving = false;
+            if (response.error) {
+                errorText = response.error;
+                return;
+            }
+            root.saved();
+        };
+        if (eventData && eventData.id)
+            CalendarService.updateEvent(eventData.id, fields, cb);
+        else
+            CalendarService.createEvent(fields, cb);
+    }
+
+    Component.onCompleted: {
+        if (!eventData) {
+            fCalendarId = CalendarService.defaultCalendar() ? CalendarService.defaultCalendar().id : "";
+            return;
+        }
+        fTitle = eventData.title || "";
+        fAllDay = !!eventData.allDay;
+        fDate = eventData.start;
+        const fmt = "HH:mm";
+        fStart = Qt.formatTime(eventData.start, fmt);
+        fEnd = Qt.formatTime(eventData.end, fmt);
+        fLocation = eventData.location || "";
+        fDescription = eventData.description || "";
+        fCalendarId = eventData.calendarId || "";
+        if (eventData.reminders && eventData.reminders.length > 0)
+            fReminder = eventData.reminders[0].minutes;
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        radius: Theme.cornerRadius
+        color: Qt.rgba(0, 0, 0, 0.45)
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.closeRequested()
+        }
+    }
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: Math.min(parent.width - Theme.spacingL * 2, 400)
+        height: Math.min(parent.height - Theme.spacingM, 300)
+        radius: Theme.cornerRadius
+        color: Theme.surfaceContainerHigh
+        border.color: Theme.outlineMedium
+        border.width: 1
+
+        MouseArea {
+            anchors.fill: parent
+        }
+
+        DankFlickable {
+            anchors.fill: parent
+            anchors.margins: Theme.spacingM
+            contentWidth: width
+            contentHeight: form.implicitHeight
+            clip: true
+
+            Column {
+                id: form
+                width: parent.width
+                spacing: Theme.spacingS
+
+                StyledText {
+                    width: parent.width
+                    text: root.eventData ? I18n.tr("Edit event") : I18n.tr("New event")
+                    font.pixelSize: Theme.fontSizeMedium
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    horizontalAlignment: Text.AlignLeft
+                }
+
+                DankTextField {
+                    width: parent.width
+                    labelText: I18n.tr("Title")
+                    leftIconName: "title"
+                    leftIconSize: Theme.iconSize - 6
+                    placeholderText: I18n.tr("Event title")
+                    text: root.fTitle
+                    onTextChanged: root.fTitle = text
+                }
+
+                DankToggle {
+                    width: parent.width
+                    text: I18n.tr("All day")
+                    checked: root.fAllDay
+                    onToggled: checked => root.fAllDay = checked
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+
+                    DankActionButton {
+                        circular: false
+                        iconName: "chevron_left"
+                        iconSize: 16
+                        onClicked: {
+                            let d = new Date(root.fDate);
+                            d.setDate(d.getDate() - 1);
+                            root.fDate = d;
+                        }
+                    }
+
+                    StyledText {
+                        width: parent.width - 72
+                        text: Qt.formatDate(root.fDate, "ddd, MMM d yyyy")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceText
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
+                        height: 32
+                    }
+
+                    DankActionButton {
+                        circular: false
+                        iconName: "chevron_right"
+                        iconSize: 16
+                        onClicked: {
+                            let d = new Date(root.fDate);
+                            d.setDate(d.getDate() + 1);
+                            root.fDate = d;
+                        }
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: !root.fAllDay
+
+                    DankTextField {
+                        width: (parent.width - Theme.spacingS) / 2
+                        labelText: I18n.tr("Start")
+                        leftIconName: "schedule"
+                        leftIconSize: Theme.iconSize - 6
+                        placeholderText: "HH:MM"
+                        text: root.fStart
+                        onTextChanged: root.fStart = text
+                    }
+
+                    DankTextField {
+                        width: (parent.width - Theme.spacingS) / 2
+                        labelText: I18n.tr("End")
+                        placeholderText: "HH:MM"
+                        text: root.fEnd
+                        onTextChanged: root.fEnd = text
+                    }
+                }
+
+                DankDropdown {
+                    width: parent.width
+                    text: I18n.tr("Calendar")
+                    options: root._cals.map(c => c.name)
+                    currentValue: root._calendarName(root.fCalendarId)
+                    onValueChanged: value => {
+                        for (let i = 0; i < root._cals.length; i++) {
+                            if (root._cals[i].name === value) {
+                                root.fCalendarId = root._cals[i].id;
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                DankDropdown {
+                    width: parent.width
+                    text: I18n.tr("Reminder")
+                    options: root._remLabels
+                    currentValue: root._remLabels[Math.max(0, root._remMins.indexOf(root.fReminder))]
+                    onValueChanged: value => {
+                        const idx = root._remLabels.indexOf(value);
+                        if (idx >= 0)
+                            root.fReminder = root._remMins[idx];
+                    }
+                }
+
+                DankTextField {
+                    width: parent.width
+                    labelText: I18n.tr("Location")
+                    leftIconName: "place"
+                    leftIconSize: Theme.iconSize - 6
+                    placeholderText: I18n.tr("Add location")
+                    text: root.fLocation
+                    onTextChanged: root.fLocation = text
+                }
+
+                DankTextField {
+                    width: parent.width
+                    labelText: I18n.tr("Notes")
+                    leftIconName: "notes"
+                    leftIconSize: Theme.iconSize - 6
+                    placeholderText: I18n.tr("Add notes")
+                    text: root.fDescription
+                    onTextChanged: root.fDescription = text
+                }
+
+                StyledText {
+                    width: parent.width
+                    text: root.errorText
+                    visible: root.errorText !== ""
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.error
+                    wrapMode: Text.WordWrap
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    DankButton {
+                        text: root.saving ? I18n.tr("Saving…") : I18n.tr("Save")
+                        iconName: "check"
+                        buttonHeight: 32
+                        backgroundColor: Theme.primary
+                        textColor: Theme.primaryText
+                        enabled: !root.saving
+                        onClicked: root.save()
+                    }
+
+                    DankButton {
+                        text: I18n.tr("Cancel")
+                        buttonHeight: 32
+                        onClicked: root.closeRequested()
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -8,14 +8,21 @@ Rectangle {
     id: root
     readonly property var log: Log.scoped("CalendarOverviewCard")
 
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
     implicitWidth: SettingsData.showWeekNumber ? 736 : 700
 
     property bool showEventDetails: false
     property date selectedDate: systemClock.date
     property var selectedDateEvents: []
     property bool hasEvents: selectedDateEvents && selectedDateEvents.length > 0
+    property var detailEvent: null
+    property bool showEditor: false
+    property var editorEvent: null
 
     signal closeDash
+    signal navFocusRequested
 
     function weekStartQt() {
         if (SettingsData.firstDayOfWeek >= 7 || SettingsData.firstDayOfWeek < 0) {
@@ -79,7 +86,7 @@ Rectangle {
     }
 
     function updateSelectedDateEvents() {
-        if (CalendarService && CalendarService.khalAvailable) {
+        if (CalendarService && CalendarService.calendarAvailable) {
             const events = CalendarService.getEventsForDate(selectedDate);
             selectedDateEvents = events;
         } else {
@@ -88,7 +95,7 @@ Rectangle {
     }
 
     function loadEventsForMonth() {
-        if (!CalendarService || !CalendarService.khalAvailable) {
+        if (!CalendarService || !CalendarService.calendarAvailable) {
             return;
         }
 
@@ -104,11 +111,83 @@ Rectangle {
         CalendarService.loadEvents(startDate, endDate);
     }
 
+    function goToToday() {
+        const now = systemClock.date;
+        calendarGrid.selectedDate = now;
+        calendarGrid.displayDate = now;
+        root.selectedDate = now;
+        loadEventsForMonth();
+    }
+
+    function moveSelection(days) {
+        let d = new Date(calendarGrid.selectedDate);
+        d.setDate(d.getDate() + days);
+        calendarGrid.selectedDate = d;
+        root.selectedDate = d;
+        if (d.getMonth() !== calendarGrid.displayDate.getMonth() || d.getFullYear() !== calendarGrid.displayDate.getFullYear()) {
+            calendarGrid.displayDate = d;
+            loadEventsForMonth();
+        }
+    }
+
+    function shiftMonth(delta) {
+        let d = new Date(calendarGrid.displayDate);
+        d.setMonth(d.getMonth() + delta);
+        calendarGrid.displayDate = d;
+        loadEventsForMonth();
+    }
+
+    function handleKeyEvent(event) {
+        if (showEventDetails) {
+            if (event.key === Qt.Key_Escape) {
+                showEventDetails = false;
+                return true;
+            }
+            return false;
+        }
+        switch (event.key) {
+        case Qt.Key_Left:
+        case Qt.Key_H:
+            moveSelection(I18n.isRtl ? 1 : -1);
+            return true;
+        case Qt.Key_Right:
+        case Qt.Key_L:
+            moveSelection(I18n.isRtl ? -1 : 1);
+            return true;
+        case Qt.Key_Up:
+        case Qt.Key_K:
+            moveSelection(-7);
+            return true;
+        case Qt.Key_Down:
+        case Qt.Key_J:
+            moveSelection(7);
+            return true;
+        case Qt.Key_PageUp:
+            shiftMonth(-1);
+            return true;
+        case Qt.Key_PageDown:
+            shiftMonth(1);
+            return true;
+        case Qt.Key_T:
+            goToToday();
+            return true;
+        case Qt.Key_Return:
+        case Qt.Key_Enter:
+        case Qt.Key_Space:
+            root.selectedDate = calendarGrid.selectedDate;
+            showEventDetails = true;
+            return true;
+        }
+        return false;
+    }
+
     onSelectedDateChanged: updateSelectedDateEvents()
 
     onShowEventDetailsChanged: {
         if (showEventDetails) {
             taskInput.forceActiveFocus();
+        } else {
+            navFocusRequested();
         }
     }
 
@@ -122,8 +201,8 @@ Rectangle {
             updateSelectedDateEvents();
         }
 
-        function onKhalAvailableChanged() {
-            if (CalendarService && CalendarService.khalAvailable) {
+        function onCalendarAvailableChanged() {
+            if (CalendarService && CalendarService.calendarAvailable) {
                 loadEventsForMonth();
             }
             updateSelectedDateEvents();
@@ -143,6 +222,55 @@ Rectangle {
         anchors.margins: Theme.spacingM
         spacing: Theme.spacingS
 
+        Rectangle {
+            id: dankWarning
+            width: parent.width
+            visible: CalendarService && CalendarService.dankNeedsLaunch
+            height: visible ? Math.max(28, warningRow.implicitHeight) + Theme.spacingS : 0
+            radius: Theme.cornerRadius
+            color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
+            border.color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.35)
+            border.width: 1
+
+            Row {
+                id: warningRow
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Theme.spacingS
+                anchors.rightMargin: Theme.spacingS
+                spacing: Theme.spacingS
+
+                DankIcon {
+                    name: "warning"
+                    size: 16
+                    color: Theme.warning
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    width: parent.width - 16 - Theme.spacingS - (launchButton.visible ? launchButton.width + Theme.spacingS : 0)
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: (CalendarService && CalendarService.dankBinaryExists) ? I18n.tr("DankCalendar isn't running") : I18n.tr("DankCalendar isn't installed")
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceText
+                    horizontalAlignment: Text.AlignLeft
+                    wrapMode: Text.Wrap
+                }
+
+                DankButton {
+                    id: launchButton
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: CalendarService && CalendarService.dankBinaryExists
+                    text: I18n.tr("Launch")
+                    buttonHeight: 26
+                    backgroundColor: Theme.primary
+                    textColor: Theme.primaryText
+                    onClicked: CalendarService.launchDankCalendar()
+                }
+            }
+        }
+
         Item {
             width: parent.width
             height: 40
@@ -173,17 +301,46 @@ Rectangle {
                 }
             }
 
+            Rectangle {
+                width: 32
+                height: 32
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.spacingS
+                radius: Theme.cornerRadius
+                visible: CalendarService && CalendarService.canCreateEvents
+                color: addEventArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
+
+                DankIcon {
+                    anchors.centerIn: parent
+                    name: "event"
+                    size: 16
+                    color: Theme.primary
+                }
+
+                MouseArea {
+                    id: addEventArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        root.editorEvent = null;
+                        root.showEditor = true;
+                    }
+                }
+            }
+
             StyledText {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 32 + Theme.spacingS * 2
-                anchors.rightMargin: Theme.spacingS
+                anchors.rightMargin: (CalendarService && CalendarService.canCreateEvents) ? 32 + Theme.spacingS * 2 : Theme.spacingS
                 height: 40
                 anchors.verticalCenter: parent.verticalCenter
                 text: {
                     const dateStr = Qt.formatDate(selectedDate, "MMM d");
                     if (selectedDateEvents && selectedDateEvents.length > 0) {
-                        const eventCount = selectedDateEvents.length === 1 ? I18n.tr("1 task") : selectedDateEvents.length + " " + I18n.tr("tasks");
+                        const eventCount = selectedDateEvents.length === 1 ? I18n.tr("1 task", "task count next to a date") : I18n.tr("%1 tasks", "task count next to a date, %1 is the number of tasks").arg(selectedDateEvents.length);
                         return dateStr + " • " + eventCount;
                     }
                     return dateStr;
@@ -229,7 +386,7 @@ Rectangle {
             }
 
             StyledText {
-                width: parent.width - 56
+                width: parent.width - 84
                 height: 28
                 text: calendarGrid.displayDate.toLocaleDateString(I18n.locale(), "MMMM yyyy")
                 font.pixelSize: Theme.fontSizeMedium
@@ -239,6 +396,28 @@ Rectangle {
                 verticalAlignment: Text.AlignVCenter
             }
 
+            Rectangle {
+                width: 28
+                height: 28
+                radius: Theme.cornerRadius
+                color: todayArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
+
+                DankIcon {
+                    anchors.centerIn: parent
+                    name: "today"
+                    size: 14
+                    color: Theme.primary
+                }
+
+                MouseArea {
+                    id: todayArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: root.goToToday()
+                }
+            }
+
             Rectangle {
                 width: 28
                 height: 28
@@ -388,6 +567,8 @@ Rectangle {
                                 height: width
                                 color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : dayArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                                 radius: Theme.cornerRadius
+                                border.color: (isSelected && !isToday) ? Theme.primary : "transparent"
+                                border.width: (isSelected && !isToday) ? 1 : 0
 
                                 StyledText {
                                     anchors.centerIn: parent
@@ -397,21 +578,31 @@ Rectangle {
                                     font.weight: isToday ? Font.Medium : Font.Normal
                                 }
 
-                                Rectangle {
+                                Row {
                                     anchors.bottom: parent.bottom
                                     anchors.horizontalCenter: parent.horizontalCenter
-                                    anchors.bottomMargin: 4
-                                    width: 12
-                                    height: 2
-                                    radius: Theme.cornerRadius
-                                    visible: CalendarService && CalendarService.khalAvailable && CalendarService.hasEventsForDate(dayDate)
-                                    color: isToday ? Qt.lighter(Theme.primary, 1.3) : Theme.primary
-                                    opacity: isToday ? 0.9 : 0.7
+                                    anchors.bottomMargin: 3
+                                    spacing: 2
+                                    visible: CalendarService && CalendarService.calendarAvailable && CalendarService.hasEventsForDate(dayDate)
 
-                                    Behavior on opacity {
-                                        NumberAnimation {
-                                            duration: Theme.shortDuration
-                                            easing.type: Theme.standardEasing
+                                    Repeater {
+                                        model: {
+                                            const evs = CalendarService.getEventsForDate(dayDate);
+                                            const seen = [];
+                                            for (let i = 0; i < evs.length && seen.length < 3; i++) {
+                                                const c = (evs[i].color && evs[i].color.length) ? evs[i].color : "primary";
+                                                if (seen.indexOf(c) === -1)
+                                                    seen.push(c);
+                                            }
+                                            return seen;
+                                        }
+
+                                        Rectangle {
+                                            width: 5
+                                            height: 5
+                                            radius: 2.5
+                                            color: modelData === "primary" ? (isToday ? Qt.lighter(Theme.primary, 1.3) : Theme.primary) : modelData
+                                            opacity: isToday ? 0.95 : 0.8
                                         }
                                     }
                                 }
@@ -423,6 +614,7 @@ Rectangle {
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
                                 onClicked: {
+                                    calendarGrid.selectedDate = dayDate;
                                     root.selectedDate = dayDate;
                                     root.showEventDetails = true;
                                 }
@@ -622,7 +814,15 @@ Rectangle {
                             }
                         }
 
-                        color: isDragging ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : Theme.nestedSurface)
+                        readonly property bool isTask: modelData && modelData.id && modelData.id.startsWith("task_")
+                        readonly property color accentColor: {
+                            if (isTask)
+                                return modelData.completed ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Theme.primary;
+                            return (modelData && modelData.color && modelData.color.length) ? modelData.color : Theme.primary;
+                        }
+                        readonly property color surfaceColor: isDragging ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : Theme.nestedSurface)
+
+                        color: surfaceColor
                         border.color: isDragging ? Theme.primary : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : Theme.outlineMedium)
                         border.width: (isDragging || eventMouseArea.containsMouse) ? 1 : Theme.layerOutlineWidth
 
@@ -660,15 +860,22 @@ Rectangle {
                             }
                         }
 
-                        Rectangle {
-                            width: 3
-                            height: parent.height - 6
+                        Item {
+                            id: accentClip
+                            width: 4
+                            clip: true
+                            anchors.top: parent.top
+                            anchors.bottom: parent.bottom
                             anchors.left: parent.left
-                            anchors.leftMargin: 3
-                            anchors.verticalCenter: parent.verticalCenter
-                            radius: Theme.cornerRadius
-                            color: (modelData && modelData.id && modelData.id.startsWith("task_")) ? (modelData.completed ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Theme.primary) : Theme.primary
-                            opacity: 0.8
+
+                            Rectangle {
+                                width: taskItem.width
+                                height: taskItem.height
+                                radius: taskItem.radius
+                                color: taskItem.accentColor
+                                anchors.top: parent.top
+                                anchors.left: parent.left
+                            }
                         }
 
                         // Drag Handle
@@ -767,6 +974,7 @@ Rectangle {
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: (modelData && modelData.id && modelData.id.startsWith("task_") && modelData.completed) ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5) : Theme.surfaceText
                                 font.weight: Font.Medium
+                                horizontalAlignment: Text.AlignLeft
                                 elide: Text.ElideRight
                                 maximumLineCount: 1
                             }
@@ -774,21 +982,24 @@ Rectangle {
                             StyledText {
                                 width: parent.width
                                 text: {
-                                    if (!modelData || modelData.allDay) {
-                                        return I18n.tr("All day");
-                                    } else if (modelData.start && modelData.end) {
+                                    if (!modelData)
+                                        return "";
+                                    const cal = (modelData.calendar && modelData.calendar.length) ? " · " + modelData.calendar : "";
+                                    if (modelData.allDay)
+                                        return I18n.tr("All day", "calendar task with no specific time") + cal;
+                                    if (modelData.start && modelData.end) {
                                         const timeFormat = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
                                         const startTime = Qt.formatTime(modelData.start, timeFormat);
-                                        if (modelData.start.toDateString() !== modelData.end.toDateString() || modelData.start.getTime() !== modelData.end.getTime()) {
-                                            return startTime + " – " + Qt.formatTime(modelData.end, timeFormat);
-                                        }
-                                        return startTime;
+                                        if (modelData.start.toDateString() !== modelData.end.toDateString() || modelData.start.getTime() !== modelData.end.getTime())
+                                            return startTime + " – " + Qt.formatTime(modelData.end, timeFormat) + cal;
+                                        return startTime + cal;
                                     }
                                     return "";
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
                                 font.weight: Font.Normal
+                                horizontalAlignment: Text.AlignLeft
                                 visible: text !== "" && modelData && modelData.id && !modelData.id.startsWith("task_")
                             }
                         }
@@ -824,8 +1035,9 @@ Rectangle {
                                     taskItem.isEditing = false;
                                 }
 
-                                Keys.onEscapePressed: {
+                                Keys.onEscapePressed: event => {
                                     taskItem.isEditing = false;
+                                    event.accepted = true;
                                 }
                             }
                         }
@@ -838,18 +1050,15 @@ Rectangle {
                             anchors.leftMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 32 : 6
                             anchors.rightMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 64 : 0
                             hoverEnabled: true
-                            cursorShape: (modelData && (modelData.url || (modelData.id && modelData.id.startsWith("task_")))) ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            enabled: modelData && (modelData.url !== "" || (modelData.id && modelData.id.startsWith("task_"))) && !taskItem.isEditing
+                            cursorShape: modelData ? Qt.PointingHandCursor : Qt.ArrowCursor
+                            enabled: modelData && !taskItem.isEditing
                             onClicked: {
                                 if (modelData && modelData.id && modelData.id.startsWith("task_")) {
                                     CalendarService.toggleTask(modelData.id);
-                                } else if (modelData && modelData.url && modelData.url !== "") {
-                                    if (Qt.openUrlExternally(modelData.url) === false) {
-                                        log.warn("Failed to open URL: " + modelData.url);
-                                    } else {
-                                        root.closeDash();
-                                    }
+                                    return;
                                 }
+                                if (modelData)
+                                    root.detailEvent = modelData;
                             }
                         }
 
@@ -950,11 +1159,10 @@ Rectangle {
                 selectByMouse: true
                 clip: true
 
-                // Hint placeholder text
                 Text {
-                    text: I18n.tr("Add a task...")
+                    text: I18n.tr("Add a task...", "placeholder in the new-task input field")
                     color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.4)
-                    visible: !taskInput.text && !taskInput.activeFocus
+                    visible: taskInput.text.length === 0
                     font.pixelSize: Theme.fontSizeSmall
                     anchors.verticalCenter: parent.verticalCenter
                 }
@@ -966,6 +1174,52 @@ Rectangle {
                         text = "";
                     }
                 }
+
+                Keys.onEscapePressed: event => {
+                    root.showEventDetails = false;
+                    event.accepted = true;
+                }
+            }
+        }
+    }
+
+    Loader {
+        anchors.fill: parent
+        z: 1000
+        active: root.detailEvent !== null
+
+        sourceComponent: CalendarEventDetail {
+            eventData: root.detailEvent
+            canEdit: CalendarService && CalendarService.canCreateEvents && root.detailEvent && !root.detailEvent.readOnly && !(root.detailEvent.id && root.detailEvent.id.startsWith("task_"))
+            onCloseRequested: root.detailEvent = null
+            onEditRequested: {
+                root.editorEvent = root.detailEvent;
+                root.detailEvent = null;
+                root.showEditor = true;
+            }
+            onDeleteRequested: {
+                if (root.detailEvent && root.detailEvent.id)
+                    CalendarService.deleteEvent(root.detailEvent.id, null);
+                root.detailEvent = null;
+            }
+        }
+    }
+
+    Loader {
+        anchors.fill: parent
+        z: 1000
+        active: root.showEditor
+
+        sourceComponent: CalendarEventEditor {
+            eventData: root.editorEvent
+            initialDate: root.selectedDate
+            onCloseRequested: {
+                root.showEditor = false;
+                root.editorEvent = null;
+            }
+            onSaved: {
+                root.showEditor = false;
+                root.editorEvent = null;
             }
         }
     }

quickshell/Modules/DankDash/Overview/UserInfoCard.qml

@@ -67,9 +67,6 @@ Card {
                             return I18n.tr("on Niri");
                         if (CompositorService.isHyprland)
                             return I18n.tr("on Hyprland");
-                        // technically they might not be on mangowc, but its what we support in the docs
-                        if (CompositorService.isDwl)
-                            return I18n.tr("on MangoWC");
                         if (CompositorService.isMango)
                             return I18n.tr("on MangoWC");
                         if (CompositorService.isSway)
@@ -101,9 +98,7 @@ Card {
                 }
 
                 StyledText {
-                    text: DgopService.shortUptime
-                        ? I18n.tr("up") + DgopService.shortUptime.slice(2)
-                        : I18n.tr("up")
+                    text: DgopService.shortUptime ? I18n.tr("up", "uptime prefix, e.g. 'up 4h 2m'") + DgopService.shortUptime.slice(2) : I18n.tr("up", "uptime prefix, e.g. 'up 4h 2m'")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
                     anchors.verticalCenter: parent.verticalCenter

quickshell/Modules/DankDash/Overview/WeatherOverviewCard.qml

@@ -20,17 +20,25 @@ Card {
         spacing: Theme.spacingS
         visible: !WeatherService.weather.available
 
+        DankSpinner {
+            size: 24
+            visible: WeatherService.weather.loading
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+
         DankIcon {
             name: "cloud_off"
             size: 24
             color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
+            visible: !WeatherService.weather.loading
             anchors.horizontalCenter: parent.horizontalCenter
         }
 
         StyledText {
-            text: WeatherService.weather.loading ? I18n.tr("Loading...") : I18n.tr("No Weather")
+            text: I18n.tr("No Weather")
             font.pixelSize: Theme.fontSizeSmall
             color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
+            visible: !WeatherService.weather.loading
             anchors.horizontalCenter: parent.horizontalCenter
         }
 

quickshell/Modules/DankDash/OverviewTab.qml

@@ -14,6 +14,11 @@ Item {
     signal switchToWeatherTab
     signal switchToMediaTab
     signal closeDash
+    signal navFocusRequested
+
+    function handleKeyEvent(event) {
+        return calendarCard.handleKeyEvent(event);
+    }
 
     Item {
         anchors.fill: parent
@@ -54,12 +59,14 @@ Item {
 
         // Calendar - bottom middle (wider and taller)
         CalendarOverviewCard {
+            id: calendarCard
             x: parent.width * 0.2 - Theme.spacingM
             y: 100 + Theme.spacingM
             width: parent.width * 0.6
             height: 300
 
             onCloseDash: root.closeDash()
+            onNavFocusRequested: root.navFocusRequested()
         }
 
         // Media - bottom right (narrow and taller)

quickshell/Modules/Dock/Dock.qml

@@ -747,16 +747,36 @@ Variants {
                         onHeightChanged: dock._syncDockChromeState()
                     }
 
-                    ConnectedShape {
+                    Item {
+                        id: dockConnectedChrome
                         visible: Theme.isConnectedEffect && dock.reveal && !SettingsData.connectedFrameModeActive
-                        barSide: dock.connectedBarSide
-                        bodyWidth: dockBackground.width
-                        bodyHeight: dockBackground.height
-                        connectorRadius: Theme.connectedCornerRadius
-                        surfaceRadius: dock.surfaceRadius
-                        fillColor: dock.surfaceColor
-                        x: dockBackground.x - bodyX
-                        y: dockBackground.y - bodyY
+                        readonly property real extraLeft: dock.isVertical ? 0 : Theme.connectedCornerRadius
+                        readonly property real extraTop: dock.isVertical ? Theme.connectedCornerRadius : 0
+                        readonly property real bodyRadius: dock.surfaceRadius
+                        readonly property bool barTop: dock.connectedBarSide === "top"
+                        readonly property bool barBottom: dock.connectedBarSide === "bottom"
+                        readonly property bool barLeft: dock.connectedBarSide === "left"
+                        readonly property bool barRight: dock.connectedBarSide === "right"
+
+                        x: dockBackground.x - extraLeft
+                        y: dockBackground.y - extraTop
+                        width: dockBackground.width + extraLeft * 2
+                        height: dockBackground.height + extraTop * 2
+
+                        ShaderEffect {
+                            anchors.fill: parent
+                            fragmentShader: Qt.resolvedUrl("../../Shaders/qsb/connected_chrome.frag.qsb")
+
+                            property real widthPx: width
+                            property real heightPx: height
+                            property vector4d surfaceColor: Qt.vector4d(dock.surfaceColor.r, dock.surfaceColor.g, dock.surfaceColor.b, dock.surfaceColor.a)
+                            property vector4d shadowColor: Qt.vector4d(0, 0, 0, 0)
+                            property vector4d shadowParam: Qt.vector4d(0, 0, 0, 0)
+                            property vector4d ambientParam: Qt.vector4d(0, 0, 0, 0)
+                            property vector4d bodyRect: Qt.vector4d(dockConnectedChrome.extraLeft, dockConnectedChrome.extraTop, dockBackground.width, dockBackground.height)
+                            property vector4d cornerRadius: Qt.vector4d(dockConnectedChrome.barTop || dockConnectedChrome.barLeft ? 0 : dockConnectedChrome.bodyRadius, dockConnectedChrome.barTop || dockConnectedChrome.barRight ? 0 : dockConnectedChrome.bodyRadius, dockConnectedChrome.barBottom || dockConnectedChrome.barRight ? 0 : dockConnectedChrome.bodyRadius, dockConnectedChrome.barBottom || dockConnectedChrome.barLeft ? 0 : dockConnectedChrome.bodyRadius)
+                            property vector4d edgeParam: Qt.vector4d(dockConnectedChrome.barTop ? 0 : (dockConnectedChrome.barBottom ? 1 : (dockConnectedChrome.barLeft ? 2 : 3)), Theme.connectedCornerRadius, 0, 0)
+                        }
                     }
 
                     Shape {

quickshell/Modules/Dock/DockLauncherButton.qml

@@ -236,7 +236,7 @@ Item {
             }
 
             IconImage {
-                visible: SettingsData.dockLauncherLogoMode === "compositor" && (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle || CompositorService.isLabwc)
+                visible: SettingsData.dockLauncherLogoMode === "compositor" && (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango || CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle || CompositorService.isLabwc)
                 anchors.centerIn: parent
                 width: actualIconSize + SettingsData.dockLauncherLogoSizeOffset
                 height: actualIconSize + SettingsData.dockLauncherLogoSizeOffset
@@ -247,8 +247,6 @@ Item {
                         return "file://" + Theme.shellDir + "/assets/niri.svg";
                     } else if (CompositorService.isHyprland) {
                         return "file://" + Theme.shellDir + "/assets/hyprland.svg";
-                    } else if (CompositorService.isDwl) {
-                        return "file://" + Theme.shellDir + "/assets/mango.png";
                     } else if (CompositorService.isMango) {
                         return "file://" + Theme.shellDir + "/assets/mango.png";
                     } else if (CompositorService.isSway) {

quickshell/Modules/Frame/FrameBorder.qml

@@ -3,10 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import qs.Common
 
-// Frame perimeter ring: the full window rectangle with a rounded-rectangle
-// cutout, rendered as a signed-distance field with analytic antialiasing.
-// One primitive: no full-output mask textures, no corner double-blend, crisp
-// edges at any scale without an FBO.
+// Frame perimeter ring with rounded cutout (SDF).
 Item {
     id: root
 

quickshell/Modules/Frame/FrameWindow.qml

@@ -49,10 +49,6 @@ PanelWindow {
     readonly property var _dockDescriptor: ConnectedModeState.surfaceDescriptor(win._screenName, "dock")
     readonly property var _notifDescriptor: ConnectedModeState.surfaceDescriptor(win._screenName, "notification")
     readonly property var _modalDescriptor: ConnectedModeState.surfaceDescriptor(win._screenName, "modal")
-    readonly property var _popoutState: ConnectedModeState.legacySurfaceState(win._screenName, "popout")
-    readonly property var _dockState: ConnectedModeState.legacySurfaceState(win._screenName, "dock")
-    readonly property var _notifState: ConnectedModeState.legacySurfaceState(win._screenName, "notification")
-    readonly property var _modalState: ConnectedModeState.legacySurfaceState(win._screenName, "modal")
 
     readonly property bool _connectedActive: CompositorService.usesConnectedFrameChromeForScreen(win.targetScreen)
     readonly property string _barSide: {
@@ -68,7 +64,7 @@ PanelWindow {
     readonly property real _ccr: Theme.connectedCornerRadius
 
     readonly property bool _popoutHorizontal: SurfaceGeometry.isHorizontal(win._popoutDescriptor.barSide)
-    readonly property bool _modalHorizontal: ConnectorGeometry.isHorizontal(win._modalState.barSide)
+    readonly property bool _modalHorizontal: SurfaceGeometry.isHorizontal(win._modalDescriptor.barSide)
     readonly property var _popoutBodyGeometry: SurfaceGeometry.animatedBodyRect(win._popoutDescriptor, win._dpr)
     readonly property var _modalBodyGeometry: SurfaceGeometry.animatedBodyRect(win._modalDescriptor, win._dpr)
     readonly property var _notifBodyGeometry: SurfaceGeometry.bodyRect(win._notifDescriptor, win._dpr)
@@ -86,18 +82,16 @@ PanelWindow {
     readonly property real _dockConnectorRadiusValue: {
         if (!_dockBodyBlurAnchor._active)
             return win._ccr;
-        const thickness = (win._dockState.barSide === "left" || win._dockState.barSide === "right") ? _dockBodyBlurAnchor.width : _dockBodyBlurAnchor.height;
+        const thickness = SurfaceGeometry.isVertical(win._dockDescriptor.barSide) ? _dockBodyBlurAnchor.width : _dockBodyBlurAnchor.height;
         const bodyRadius = win._dockBodyBlurRadiusValue;
         const maxConnectorRadius = Math.max(0, thickness - bodyRadius - win._seamOverlap);
         return Math.max(0, Math.min(win._ccr, bodyRadius, maxConnectorRadius));
     }
 
-    readonly property real _notifSideUnderlapValue: ConnectorGeometry.isVertical(win._notifState.barSide) ? win._seamOverlap : 0
-    readonly property real _notifStartUnderlapValue: win._notifState.omitStartConnector ? win._seamOverlap : 0
-    readonly property real _notifEndUnderlapValue: win._notifState.omitEndConnector ? win._seamOverlap : 0
+    readonly property real _notifSideUnderlapValue: SurfaceGeometry.isVertical(win._notifDescriptor.barSide) ? win._seamOverlap : 0
+    readonly property real _notifStartUnderlapValue: win._notifDescriptor.omitStartConnector ? win._seamOverlap : 0
+    readonly property real _notifEndUnderlapValue: win._notifDescriptor.omitEndConnector ? win._seamOverlap : 0
 
-    // Theme.snap rounds to integer pixel: equal rounded values suppress
-    // downstream Changed during sub-pixel morph jitter.
     readonly property var _popoutRadii: SurfaceGeometry.connectorRadii(win._popoutDescriptor, win._popoutBodyGeometry, win._ccr, win._surfaceRadius, win._dpr, false)
     readonly property real _effectivePopoutCcr: win._popoutRadii.near
     readonly property real _effectivePopoutFarCcr: win._popoutRadii.far
@@ -129,12 +123,8 @@ PanelWindow {
     readonly property real _surfaceRadius: Theme.connectedSurfaceRadius
     readonly property real _seamOverlap: Theme.hairline(win._dpr)
     readonly property bool _disableLayer: Quickshell.env("DMS_DISABLE_LAYER") === "true" || Quickshell.env("DMS_DISABLE_LAYER") === "1"
-    // Both elevation states render through the SDF shader; this only toggles
-    // the shadow term inside it.
     readonly property bool _elevationShadow: win._connectedActive && Theme.elevationEnabled && !win._disableLayer
-    // Active surfaces packed into four fixed SDF-shader slots. Each near (bar)
-    // edge is clamped to the cutout edge so the smooth-min connector attaches
-    // there; the per-corner smin radius is that corner's junction fillet.
+    // Pack active connected surfaces into four fixed SDF slots (near edges clamp to cutout).
     readonly property var _sdfSlots: {
         const T = win.cutoutTopInset;
         const L = win.cutoutLeftInset;
@@ -162,16 +152,7 @@ PanelWindow {
                 const s = src[i];
                 const b = clampNear(s.side, s.body);
                 const active = b.width > 0 && b.height > 0 ? 1 : 0;
-                // Map start/end (left/top, right/bottom) onto corners
-                // (tl,tr,br,bl): bar-side corners take their near connector
-                // fillet, far corners always take the far fillet so a body
-                // meeting a perpendicular border joins with an arc (smin is
-                // inert when nothing is within k). A bar-side corner is sharp
-                // where its connector is present; an omitted connector makes
-                // its far corner sharp instead (the far-cap join).
                 const sc = s.radii.startCr, ec = s.radii.endCr;
-                // Clamp the far fillet to the body extent so it cannot flare
-                // back across a shallow body into the bar mid-animation.
                 const extent = (s.side === "top" || s.side === "bottom") ? b.height : b.width;
                 const fc = Math.min(s.radii.farCr, extent);
                 const omitS = s.radii.farStartCr > 0;
@@ -179,9 +160,6 @@ PanelWindow {
                 const bodyR = s.radii.surfaceRadius;
                 const nearS = omitS ? bodyR : 0, nearE = omitE ? bodyR : 0;
                 const farS = omitS ? 0 : bodyR, farE = omitE ? 0 : bodyR;
-                // An omitted bar-side corner sits flush against the border, so
-                // it keeps a nonzero fillet (a zero k hard-joins the coincident
-                // edges and shows a half-coverage hairline along the seam).
                 const kS = omitS ? fc : sc, kE = omitE ? fc : ec;
                 let ks, cr;
                 if (s.side === "top") {
@@ -225,8 +203,6 @@ PanelWindow {
         return Math.max(0, Math.min(requested, maxRadius));
     }
 
-    // Pins every surface blur region to zero while frame blur cannot be
-    // consumed, so animations stop dirtying the region tree.
     readonly property bool _blurSurfacesActive: BlurService.enabled && SettingsData.frameBlurEnabled && win._frameActive
     readonly property int _blurCutoutCompensation: SettingsData.frameOpacity <= 0.2 ? 1 : 0
     readonly property int _blurCutoutLeft: Math.max(0, win.cutoutLeftInset - win._blurCutoutCompensation)
@@ -239,9 +215,6 @@ PanelWindow {
         return Math.max(0, Math.min(requested, maxRadius));
     }
 
-    // Blur regions bind rounded integer pixels directly: equal rounded values
-    // suppress Changed during sub-pixel motion, and inactive children pin to
-    // all-zero so the region build skips them.
     QtObject {
         id: _notifBodyBlurAnchor
 
@@ -259,7 +232,6 @@ PanelWindow {
         width: win._windowRegionWidth
         height: win._windowRegionHeight
 
-        // Frame cutout (always active when frame is on)
         Region {
             id: _blurCutout
             intersection: Intersection.Subtract
@@ -284,7 +256,7 @@ PanelWindow {
         Region {
             id: _popoutBodyBlurCap
 
-            readonly property string _side: win._popoutState.barSide
+            readonly property string _side: win._popoutDescriptor.barSide
             readonly property real _capThickness: win._popoutBlurCapThickness()
             readonly property bool _active: _popoutBodyBlurAnchor._active && _capThickness > 0 && _popoutBodyBlurAnchor.width > 0 && _popoutBodyBlurAnchor.height > 0
             readonly property int _capWidth: (_side === "left" || _side === "right") ? Math.round(Math.min(_capThickness, _popoutBodyBlurAnchor.width)) : _popoutBodyBlurAnchor.width
@@ -311,7 +283,7 @@ PanelWindow {
                 id: _popoutLeftConnectorCutout
 
                 readonly property bool _active: _popoutLeftConnectorBlurAnchor.width > 0 && _popoutLeftConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._popoutState.barSide, "left")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._popoutDescriptor.barSide, "left")
                 readonly property real _radius: win._popoutConnectorRadiusLeft
 
                 intersection: Intersection.Subtract
@@ -338,7 +310,7 @@ PanelWindow {
                 id: _popoutRightConnectorCutout
 
                 readonly property bool _active: _popoutRightConnectorBlurAnchor.width > 0 && _popoutRightConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._popoutState.barSide, "right")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._popoutDescriptor.barSide, "right")
                 readonly property real _radius: win._popoutConnectorRadiusRight
 
                 intersection: Intersection.Subtract
@@ -389,8 +361,8 @@ PanelWindow {
                 id: _popoutFarStartConnectorCutout
 
                 readonly property bool _active: _popoutFarStartConnectorBlurAnchor.width > 0 && _popoutFarStartConnectorBlurAnchor.height > 0
-                readonly property string _barSide: win._farConnectorBarSide(win._popoutState.barSide, "left")
-                readonly property string _placement: win._farConnectorPlacement(win._popoutState.barSide, "left")
+                readonly property string _barSide: win._farConnectorBarSide(win._popoutDescriptor.barSide, "left")
+                readonly property string _placement: win._farConnectorPlacement(win._popoutDescriptor.barSide, "left")
                 readonly property string _arcCorner: ConnectorGeometry.arcCorner(_barSide, _placement)
                 readonly property real _radius: win._effectivePopoutFarStartCcr
 
@@ -418,8 +390,8 @@ PanelWindow {
                 id: _popoutFarEndConnectorCutout
 
                 readonly property bool _active: _popoutFarEndConnectorBlurAnchor.width > 0 && _popoutFarEndConnectorBlurAnchor.height > 0
-                readonly property string _barSide: win._farConnectorBarSide(win._popoutState.barSide, "right")
-                readonly property string _placement: win._farConnectorPlacement(win._popoutState.barSide, "right")
+                readonly property string _barSide: win._farConnectorBarSide(win._popoutDescriptor.barSide, "right")
+                readonly property string _placement: win._farConnectorPlacement(win._popoutDescriptor.barSide, "right")
                 readonly property string _arcCorner: ConnectorGeometry.arcCorner(_barSide, _placement)
                 readonly property real _radius: win._effectivePopoutFarEndCcr
 
@@ -446,7 +418,7 @@ PanelWindow {
         Region {
             id: _dockBodyBlurCap
 
-            readonly property string _side: win._dockState.barSide
+            readonly property string _side: win._dockDescriptor.barSide
             readonly property bool _active: _dockBodyBlurAnchor._active && _dockBodyBlurAnchor.width > 0 && _dockBodyBlurAnchor.height > 0
             readonly property int _capWidth: (_side === "left" || _side === "right") ? Math.round(Math.min(win._dockConnectorRadiusValue, _dockBodyBlurAnchor.width)) : _dockBodyBlurAnchor.width
             readonly property int _capHeight: (_side === "top" || _side === "bottom") ? Math.round(Math.min(win._dockConnectorRadiusValue, _dockBodyBlurAnchor.height)) : _dockBodyBlurAnchor.height
@@ -471,7 +443,7 @@ PanelWindow {
                 id: _dockLeftConnectorCutout
 
                 readonly property bool _active: _dockLeftConnectorBlurAnchor.width > 0 && _dockLeftConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._dockState.barSide, "left")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._dockDescriptor.barSide, "left")
 
                 intersection: Intersection.Subtract
                 radius: win._dockConnectorRadiusValue
@@ -496,7 +468,7 @@ PanelWindow {
                 id: _dockRightConnectorCutout
 
                 readonly property bool _active: _dockRightConnectorBlurAnchor.width > 0 && _dockRightConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._dockState.barSide, "right")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._dockDescriptor.barSide, "right")
 
                 intersection: Intersection.Subtract
                 radius: win._dockConnectorRadiusValue
@@ -522,7 +494,7 @@ PanelWindow {
         Region {
             id: _notifBodyBlurCap
 
-            readonly property string _side: win._notifState.barSide
+            readonly property string _side: win._notifDescriptor.barSide
             readonly property real _capRadius: win._effectiveNotifMaxCcr
             readonly property bool _active: _notifBodySceneBlurAnchor._active && _notifBodySceneBlurAnchor.width > 0 && _notifBodySceneBlurAnchor.height > 0 && _capRadius > 0
             readonly property int _capWidth: (_side === "left" || _side === "right") ? Math.round(Math.min(_capRadius, _notifBodySceneBlurAnchor.width)) : _notifBodySceneBlurAnchor.width
@@ -549,7 +521,7 @@ PanelWindow {
                 id: _notifLeftConnectorCutout
 
                 readonly property bool _active: _notifLeftConnectorBlurAnchor.width > 0 && _notifLeftConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._notifState.barSide, "left")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._notifDescriptor.barSide, "left")
                 readonly property real _radius: win._notifConnectorRadiusLeft
 
                 intersection: Intersection.Subtract
@@ -576,7 +548,7 @@ PanelWindow {
                 id: _notifRightConnectorCutout
 
                 readonly property bool _active: _notifRightConnectorBlurAnchor.width > 0 && _notifRightConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._notifState.barSide, "right")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._notifDescriptor.barSide, "right")
                 readonly property real _radius: win._notifConnectorRadiusRight
 
                 intersection: Intersection.Subtract
@@ -627,8 +599,8 @@ PanelWindow {
                 id: _notifFarStartConnectorCutout
 
                 readonly property bool _active: _notifFarStartConnectorBlurAnchor.width > 0 && _notifFarStartConnectorBlurAnchor.height > 0
-                readonly property string _barSide: win._farConnectorBarSide(win._notifState.barSide, "left")
-                readonly property string _placement: win._farConnectorPlacement(win._notifState.barSide, "left")
+                readonly property string _barSide: win._farConnectorBarSide(win._notifDescriptor.barSide, "left")
+                readonly property string _placement: win._farConnectorPlacement(win._notifDescriptor.barSide, "left")
                 readonly property string _arcCorner: ConnectorGeometry.arcCorner(_barSide, _placement)
                 readonly property real _radius: win._effectiveNotifFarStartCcr
 
@@ -656,8 +628,8 @@ PanelWindow {
                 id: _notifFarEndConnectorCutout
 
                 readonly property bool _active: _notifFarEndConnectorBlurAnchor.width > 0 && _notifFarEndConnectorBlurAnchor.height > 0
-                readonly property string _barSide: win._farConnectorBarSide(win._notifState.barSide, "right")
-                readonly property string _placement: win._farConnectorPlacement(win._notifState.barSide, "right")
+                readonly property string _barSide: win._farConnectorBarSide(win._notifDescriptor.barSide, "right")
+                readonly property string _placement: win._farConnectorPlacement(win._notifDescriptor.barSide, "right")
                 readonly property string _arcCorner: ConnectorGeometry.arcCorner(_barSide, _placement)
                 readonly property real _radius: win._effectiveNotifFarEndCcr
 
@@ -684,7 +656,7 @@ PanelWindow {
         Region {
             id: _modalBodyBlurCap
 
-            readonly property string _side: win._modalState.barSide
+            readonly property string _side: win._modalDescriptor.barSide
             readonly property real _capThickness: win._modalBlurCapThickness()
             readonly property bool _active: _modalBodyBlurAnchor._active && _capThickness > 0 && _modalBodyBlurAnchor.width > 0 && _modalBodyBlurAnchor.height > 0
             readonly property int _capWidth: (_side === "left" || _side === "right") ? Math.round(Math.min(_capThickness, _modalBodyBlurAnchor.width)) : _modalBodyBlurAnchor.width
@@ -711,7 +683,7 @@ PanelWindow {
                 id: _modalLeftConnectorCutout
 
                 readonly property bool _active: _modalLeftConnectorBlurAnchor.width > 0 && _modalLeftConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._modalState.barSide, "left")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._modalDescriptor.barSide, "left")
                 readonly property real _radius: win._modalConnectorRadiusLeft
 
                 intersection: Intersection.Subtract
@@ -738,7 +710,7 @@ PanelWindow {
                 id: _modalRightConnectorCutout
 
                 readonly property bool _active: _modalRightConnectorBlurAnchor.width > 0 && _modalRightConnectorBlurAnchor.height > 0
-                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._modalState.barSide, "right")
+                readonly property string _arcCorner: ConnectorGeometry.arcCorner(win._modalDescriptor.barSide, "right")
                 readonly property real _radius: win._modalConnectorRadiusRight
 
                 intersection: Intersection.Subtract
@@ -789,8 +761,8 @@ PanelWindow {
                 id: _modalFarStartConnectorCutout
 
                 readonly property bool _active: _modalFarStartConnectorBlurAnchor.width > 0 && _modalFarStartConnectorBlurAnchor.height > 0
-                readonly property string _barSide: win._farConnectorBarSide(win._modalState.barSide, "left")
-                readonly property string _placement: win._farConnectorPlacement(win._modalState.barSide, "left")
+                readonly property string _barSide: win._farConnectorBarSide(win._modalDescriptor.barSide, "left")
+                readonly property string _placement: win._farConnectorPlacement(win._modalDescriptor.barSide, "left")
                 readonly property string _arcCorner: ConnectorGeometry.arcCorner(_barSide, _placement)
                 readonly property real _radius: win._effectiveModalFarStartCcr
 
@@ -818,8 +790,8 @@ PanelWindow {
                 id: _modalFarEndConnectorCutout
 
                 readonly property bool _active: _modalFarEndConnectorBlurAnchor.width > 0 && _modalFarEndConnectorBlurAnchor.height > 0
-                readonly property string _barSide: win._farConnectorBarSide(win._modalState.barSide, "right")
-                readonly property string _placement: win._farConnectorPlacement(win._modalState.barSide, "right")
+                readonly property string _barSide: win._farConnectorBarSide(win._modalDescriptor.barSide, "right")
+                readonly property string _placement: win._farConnectorPlacement(win._modalDescriptor.barSide, "right")
                 readonly property string _arcCorner: ConnectorGeometry.arcCorner(_barSide, _placement)
                 readonly property real _radius: win._effectiveModalFarEndCcr
 
@@ -833,9 +805,8 @@ PanelWindow {
         }
     }
 
-    // Notif body scene rect, accounting for start/end/side underlaps per bar orientation.
     function _notifBodyScene() {
-        const isHoriz = ConnectorGeometry.isHorizontal(win._notifState.barSide);
+        const isHoriz = SurfaceGeometry.isHorizontal(win._notifDescriptor.barSide);
         const start = win._notifStartUnderlapValue;
         const end = win._notifEndUnderlapValue;
         const side = win._notifSideUnderlapValue;
@@ -848,7 +819,7 @@ PanelWindow {
             };
         }
         return {
-            "x": _notifBodyBlurAnchor.x - (win._notifState.barSide === "left" ? side : 0),
+            "x": _notifBodyBlurAnchor.x - (win._notifDescriptor.barSide === "left" ? side : 0),
             "y": _notifBodyBlurAnchor.y - start,
             "width": _notifBodyBlurAnchor.width + side,
             "height": _notifBodyBlurAnchor.height + start + end
@@ -865,13 +836,10 @@ PanelWindow {
         return Math.max(0, Math.min(win._effectivePopoutMaxCcr, extent - win._surfaceRadius));
     }
 
-    // Active connected surfaces fed to the unified silhouette path. Raw animated
-    // body rects (no seam/fill overlap); the builder anchors each to the cutout
-    // edge. Connector radii use the same per-surface helpers as the blur regions.
     function _unifiedSurfaces() {
         const arr = [];
         const p = win._popoutBodyGeometry;
-        if (win._popoutDescriptor.visible && win._popoutState.screen === win._screenName && p.width > 0 && p.height > 0)
+        if (win._popoutDescriptor.visible && win._popoutDescriptor.screenName === win._screenName && p.width > 0 && p.height > 0)
             arr.push({
                 "side": win._popoutDescriptor.barSide,
                 "body": {"x": p.x, "y": p.y, "width": p.width, "height": p.height},
@@ -975,8 +943,6 @@ PanelWindow {
         } catch (e) {}
     }
 
-    // Coalesce bursts of settings-change signals into a single _buildBlur() call
-    // on the next event loop tick.
     DeferredAction {
         id: blurRebuildAction
         onTriggered: win._runBlurRebuild()
@@ -1100,10 +1066,6 @@ PanelWindow {
         cutoutRadius: win.cutoutRadius
     }
 
-    // The entire connected silhouette (frame ring + every active chrome) as one
-    // SDF in a fragment shader. Analytic fwidth AA → crisp at any scale, no FBO;
-    // the smooth-min radius is the connector. The elevation shadow is derived
-    // from the same distance field, so elevation-on needs no grouping layer.
     ShaderEffect {
         anchors.fill: parent
         visible: win._connectedActive

quickshell/Modules/Lock/LockScreenContent.qml

@@ -753,9 +753,46 @@ Item {
                         }
                     }
 
-                    TextInput {
+                    FocusScope {
                         id: passwordField
 
+                        property string text: root.passwordBuffer
+                        property int cursorPosition: text.length
+
+                        signal accepted()
+
+                        function clampCursorPosition() {
+                            cursorPosition = Math.max(0, Math.min(cursorPosition, text.length));
+                        }
+
+                        function clear() {
+                            text = "";
+                            cursorPosition = 0;
+                        }
+
+                        function insertText(value) {
+                            if (value.length === 0)
+                                return;
+                            clampCursorPosition();
+                            text = text.slice(0, cursorPosition) + value + text.slice(cursorPosition);
+                            cursorPosition += value.length;
+                        }
+
+                        function backspace() {
+                            clampCursorPosition();
+                            if (cursorPosition === 0)
+                                return;
+                            text = text.slice(0, cursorPosition - 1) + text.slice(cursorPosition);
+                            cursorPosition -= 1;
+                        }
+
+                        function isPrintableText(value) {
+                            if (value.length === 0)
+                                return false;
+                            const code = value.charCodeAt(0);
+                            return code >= 0x20 && code !== 0x7f;
+                        }
+
                         anchors.fill: parent
                         anchors.leftMargin: lockIconContainer.width + Theme.spacingM * 2
                         anchors.rightMargin: {
@@ -781,7 +818,6 @@ Item {
                         focus: true
                         enabled: !demoMode
                         activeFocusOnTab: !demoMode
-                        echoMode: parent.showPassword ? TextInput.Normal : TextInput.Password
                         onTextChanged: {
                             if (!demoMode) {
                                 root.passwordBuffer = text;
@@ -809,6 +845,8 @@ Item {
                                     return;
                                 }
                                 clear();
+                                event.accepted = true;
+                                return;
                             }
 
                             if (pam.passwd.active) {
@@ -816,6 +854,23 @@ Item {
                                 event.accepted = true;
                                 return;
                             }
+
+                            if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+                                accepted();
+                                event.accepted = true;
+                                return;
+                            }
+
+                            if (event.key === Qt.Key_Backspace) {
+                                backspace();
+                                event.accepted = true;
+                                return;
+                            }
+
+                            if (isPrintableText(event.text)) {
+                                insertText(event.text);
+                                event.accepted = true;
+                            }
                         }
 
                         Component.onCompleted: {
@@ -849,6 +904,17 @@ Item {
                                 });
                             }
                         }
+
+                        Connections {
+                            target: root
+
+                            function onPasswordBufferChanged() {
+                                if (passwordField.text === root.passwordBuffer)
+                                    return;
+                                passwordField.text = root.passwordBuffer;
+                                passwordField.cursorPosition = passwordField.text.length;
+                            }
+                        }
                     }
 
                     KeyboardController {

quickshell/Modules/Notepad/Notepad.qml

@@ -1,5 +1,6 @@
 pragma ComponentBehavior: Bound
 import QtQuick
+import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import qs.Common
@@ -21,21 +22,71 @@ Item {
     property var currentTab: NotepadStorageService.tabs.length > NotepadStorageService.currentTabIndex ? NotepadStorageService.tabs[NotepadStorageService.currentTabIndex] : null
     property bool showSettingsMenu: false
     property string pendingSaveContent: ""
+    readonly property bool conflictBannerVisible: currentTab !== null && NotepadStorageService.conflictTabId === currentTab.id
     property var slideout: null
+    property bool inPopout: false
+    property bool surfaceVisible: slideout ? slideout.isVisible : true
 
     signal hideRequested
+    signal popoutRequested
+    signal dockRequested
     signal previewRequested(string content)
 
+    function externalSync() {
+        textEditor.syncFromDisk();
+    }
+
+    function flushAutoSave() {
+        textEditor.autoSaveToSession();
+    }
+
     Ref {
         service: NotepadStorageService
     }
 
+    // In connected frame mode the slideout sits on the Overlay layer
+    onFileDialogOpenChanged: {
+        if (slideout)
+            slideout.suppressOverlayLayer = fileDialogOpen;
+    }
+
     Connections {
         target: slideout
         enabled: slideout !== null
         function onAboutToHide() {
             textEditor.autoSaveToSession();
         }
+        function onRevealed() {
+            textEditor.syncFromDisk();
+        }
+    }
+
+    function showConflictBanner(diskContent) {
+        if (!currentTab)
+            return;
+        NotepadStorageService.flagConflict(currentTab.id, diskContent);
+    }
+
+    function resolveConflictKeepEdits() {
+        if (!root.conflictBannerVisible)
+            return;
+        NotepadStorageService.clearConflict();
+        if (currentTab && currentTab.filePath && !currentTab.isTemporary) {
+            root.saveToFile("file://" + currentTab.filePath);
+        }
+    }
+
+    function resolveConflictReload() {
+        if (!root.conflictBannerVisible)
+            return;
+        const diskContent = NotepadStorageService.conflictDiskContent;
+        NotepadStorageService.clearConflict();
+        textEditor.reloadFromDisk(diskContent);
+    }
+
+    function dismissConflictBanner() {
+        if (root.conflictBannerVisible)
+            NotepadStorageService.clearConflict();
     }
 
     function hasUnsavedChanges() {
@@ -51,10 +102,14 @@ Item {
     }
 
     function performCreateNewTab() {
+        textEditor.commitLiveBuffer();
         NotepadStorageService.createNewTab();
+        textEditor.applyingShared = true;
         textEditor.text = "";
         textEditor.lastSavedContent = "";
+        textEditor.loadedTabId = -1;
         textEditor.contentLoaded = true;
+        textEditor.applyingShared = false;
         textEditor.textArea.forceActiveFocus();
     }
 
@@ -86,7 +141,6 @@ Item {
 
         NotepadStorageService.switchToTab(tabIndex);
         Qt.callLater(() => {
-            textEditor.loadCurrentTabContent();
             if (currentTab) {
                 root.currentFileName = currentTab.fileName || "";
                 root.currentFileUrl = currentTab.fileUrl || "";
@@ -100,6 +154,7 @@ Item {
         var content = textEditor.text;
         var filePath = fileUrl.toString().replace(/^file:\/\//, '');
 
+        textEditor.externalWatchPaused = true;
         saveFileView.path = "";
         pendingSaveContent = content;
         saveFileView.path = filePath;
@@ -109,6 +164,53 @@ Item {
         });
     }
 
+    function saveExternalWithFreshnessCheck() {
+        if (!currentTab || currentTab.isTemporary || !currentTab.filePath)
+            return;
+        const filePath = currentTab.filePath;
+        loadFileView.path = "";
+        loadFileView.path = filePath;
+
+        if (!loadFileView.waitForJob()) {
+            saveToFile("file://" + filePath);
+            return;
+        }
+        Qt.callLater(() => {
+            if (!currentTab || currentTab.isTemporary || currentTab.filePath !== filePath)
+                return;
+            const diskContent = loadFileView.text();
+            if (diskContent !== undefined && diskContent !== null && diskContent !== textEditor.text && diskContent !== textEditor.lastSavedContent) {
+                root.showConflictBanner(diskContent);
+                return;
+            }
+            saveToFile("file://" + filePath);
+        });
+    }
+
+    function autoSaveExternal() {
+        if (!SettingsData.notepadAutoSave)
+            return;
+        if (!currentTab || currentTab.isTemporary || !currentTab.filePath)
+            return;
+        if (!textEditor.hasUnsavedChanges())
+            return;
+        const filePath = currentTab.filePath;
+        loadFileView.path = "";
+        loadFileView.path = filePath;
+        if (!loadFileView.waitForJob())
+            return;
+        Qt.callLater(() => {
+            if (!currentTab || currentTab.isTemporary || currentTab.filePath !== filePath)
+                return;
+            const diskContent = loadFileView.text();
+            if (diskContent === undefined || diskContent === null)
+                return;
+            if (diskContent !== textEditor.lastSavedContent)
+                return;
+            saveToFile("file://" + filePath);
+        });
+    }
+
     function loadFromFile(fileUrl) {
         if (hasUnsavedTemporaryContent()) {
             root.pendingFileUrl = fileUrl;
@@ -146,14 +248,155 @@ Item {
 
                     root.currentFileName = fileName;
                     root.currentFileUrl = fileUrl;
-                    textEditor.saveCurrentTabContent();
+                    textEditor.loadedTabId = currentTab.id;
+                    NotepadStorageService.clearSessionBuffer(currentTab.id);
+                    if (root.conflictBannerVisible)
+                        NotepadStorageService.clearConflict();
                 }
             });
         }
     }
 
+    Item {
+        id: conflictBanner
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: root.conflictBannerVisible ? bannerRect.implicitHeight : 0
+        visible: height > 0
+        clip: true
+        z: 5
+
+        Behavior on height {
+            NumberAnimation {
+                duration: Theme.shortDuration
+                easing.type: Theme.standardEasing
+            }
+        }
+
+        StyledRect {
+            id: bannerRect
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+            implicitHeight: bannerLayout.implicitHeight + Theme.spacingM * 2
+            radius: Theme.cornerRadius
+            color: Theme.withAlpha(Theme.warning, 0.12)
+            border.color: Theme.withAlpha(Theme.warning, 0.5)
+            border.width: 1
+
+            ColumnLayout {
+                id: bannerLayout
+                anchors.fill: parent
+                anchors.margins: Theme.spacingM
+                spacing: Theme.spacingS
+
+                RowLayout {
+                    Layout.fillWidth: true
+                    spacing: Theme.spacingM
+
+                    DankIcon {
+                        Layout.alignment: Qt.AlignVCenter
+                        name: "sync_problem"
+                        size: Theme.iconSize - 2
+                        color: Theme.warning
+                    }
+
+                    StyledText {
+                        Layout.fillWidth: true
+                        Layout.alignment: Qt.AlignVCenter
+                        text: I18n.tr("File changed on disk")
+                        font.pixelSize: Theme.fontSizeMedium
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                        wrapMode: Text.NoWrap
+                        elide: Text.ElideRight
+                    }
+
+                    DankActionButton {
+                        Layout.alignment: Qt.AlignVCenter
+                        iconName: "close"
+                        iconSize: Theme.iconSizeSmall
+                        iconColor: Theme.surfaceText
+                        buttonSize: 28
+                        onClicked: root.dismissConflictBanner()
+                    }
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: 32
+
+                    Row {
+                        id: bannerActions
+                        anchors.right: parent.right
+                        spacing: Theme.spacingS
+
+                        readonly property real available: parent.width
+
+                        StyledRect {
+                            width: Math.min(keepText.implicitWidth + Theme.spacingM * 2, Math.max(104, (bannerActions.available - bannerActions.spacing) / 2))
+                            height: 32
+                            radius: Theme.cornerRadius
+                            color: "transparent"
+                            border.color: Theme.outlineMedium
+                            border.width: 1
+
+                            StateLayer {
+                                anchors.fill: parent
+                                cornerRadius: parent.radius
+                                stateColor: Theme.surfaceText
+                                onClicked: root.resolveConflictKeepEdits()
+                            }
+
+                            StyledText {
+                                id: keepText
+                                anchors.centerIn: parent
+                                width: parent.width - Theme.spacingM
+                                text: I18n.tr("Keep My Edits")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceText
+                                horizontalAlignment: Text.AlignHCenter
+                                elide: Text.ElideRight
+                            }
+                        }
+
+                        StyledRect {
+                            width: Math.min(reloadText.implicitWidth + Theme.spacingM * 2, Math.max(116, (bannerActions.available - bannerActions.spacing) / 2))
+                            height: 32
+                            radius: Theme.cornerRadius
+                            color: Theme.primary
+
+                            StateLayer {
+                                anchors.fill: parent
+                                cornerRadius: parent.radius
+                                stateColor: Theme.background
+                                onClicked: root.resolveConflictReload()
+                            }
+
+                            StyledText {
+                                id: reloadText
+                                anchors.centerIn: parent
+                                width: parent.width - Theme.spacingM
+                                text: I18n.tr("Reload From Disk")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.background
+                                horizontalAlignment: Text.AlignHCenter
+                                elide: Text.ElideRight
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     Column {
-        anchors.fill: parent
+        anchors.top: conflictBanner.bottom
+        anchors.topMargin: root.conflictBannerVisible ? Theme.spacingM : 0
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
         spacing: Theme.spacingM
 
         NotepadTabs {
@@ -178,11 +421,12 @@ Item {
             id: textEditor
             width: parent.width
             height: parent.height - tabBar.height - Theme.spacingM * 2
+            inPopout: root.inPopout
+            surfaceVisible: root.surfaceVisible
 
             onSaveRequested: {
                 if (currentTab && !currentTab.isTemporary && currentTab.filePath) {
-                    var fileUrl = "file://" + currentTab.filePath;
-                    saveToFile(fileUrl);
+                    root.saveExternalWithFreshnessCheck();
                 } else {
                     root.fileDialogOpen = true;
                     saveBrowserLoader.active = true;
@@ -214,12 +458,28 @@ Item {
 
             onEscapePressed: {
                 textEditor.autoSaveToSession();
-                root.hideRequested();
+                if (showSettingsMenu) {
+                    showSettingsMenu = false;
+                    return;
+                }
+                if (!root.inPopout) {
+                    root.hideRequested();
+                }
             }
 
             onSettingsRequested: {
                 showSettingsMenu = !showSettingsMenu;
             }
+
+            onPopoutRequested: root.popoutRequested()
+
+            onDockRequested: root.dockRequested()
+
+            onConflictDetected: diskContent => {
+                root.showConflictBanner(diskContent);
+            }
+
+            onAutoSaveRequested: root.autoSaveExternal()
         }
     }
 
@@ -242,17 +502,24 @@ Item {
         printErrors: true
 
         onSaved: {
-            if (currentTab && saveFileView.path && pendingSaveContent) {
+            if (currentTab && saveFileView.path) {
                 NotepadStorageService.updateTabMetadata(NotepadStorageService.currentTabIndex, {
                     hasUnsavedChanges: false,
                     lastSavedContent: pendingSaveContent
                 });
                 root.lastSavedFileContent = pendingSaveContent;
-                pendingSaveContent = "";
+                textEditor.lastSavedContent = pendingSaveContent;
+                textEditor.ignoreNextExternalChange = true;
+                textEditor.commitLiveBuffer();
+                if (root.conflictBannerVisible)
+                    NotepadStorageService.clearConflict();
             }
+            textEditor.externalWatchPaused = false;
+            pendingSaveContent = "";
         }
 
         onSaveFailed: error => {
+            textEditor.externalWatchPaused = false;
             pendingSaveContent = "";
         }
     }
@@ -298,6 +565,7 @@ Item {
 
                 root.currentFileName = fileName;
                 root.currentFileUrl = fileUrl;
+                textEditor.externalWatchPaused = true;
 
                 if (currentTab) {
                     NotepadStorageService.saveTabAs(NotepadStorageService.currentTabIndex, cleanPath);
@@ -343,7 +611,7 @@ Item {
             browserTitle: I18n.tr("Open Notepad File")
             browserIcon: "folder_open"
             browserType: "notepad_load"
-            fileExtensions: ["*.txt", "*.md", "*.*"]
+            fileExtensions: ["*"]
             allowStacking: true
 
             onFileSelected: path => {
@@ -376,6 +644,7 @@ Item {
             modalHeight: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 180
             shouldBeVisible: false
             allowStacking: true
+            useOverlayLayer: true
 
             onBackgroundClicked: {
                 close();

quickshell/Modules/Notepad/NotepadPopoutWindow.qml

@@ -0,0 +1,137 @@
+import QtQuick
+import Quickshell
+import qs.Common
+import qs.Services
+import qs.Widgets
+import qs.Modules.Notepad
+
+FloatingWindow {
+    id: win
+
+    property alias shouldBeVisible: win.visible
+
+    function show() {
+        visible = true;
+    }
+
+    function hide() {
+        visible = false;
+    }
+
+    function toggle() {
+        visible = !visible;
+    }
+
+    title: I18n.tr("Notepad")
+    minimumSize: Qt.size(360, 320)
+    implicitWidth: 640
+    implicitHeight: 760
+    color: Theme.surfaceContainer
+    visible: false
+
+    onVisibleChanged: {
+        if (visible) {
+            Qt.callLater(notepad.externalSync);
+        } else {
+            notepad.flushAutoSave();
+        }
+    }
+
+    // A compositor close (e.g. niri close-window)
+    onClosed: win.visible = false
+
+    Item {
+        anchors.fill: parent
+
+        Item {
+            id: titleBar
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: 44
+            z: 10
+
+            MouseArea {
+                anchors.fill: parent
+                onPressed: windowControls.tryStartMove()
+                onDoubleClicked: windowControls.tryToggleMaximize()
+            }
+
+            Rectangle {
+                anchors.fill: parent
+                color: Theme.surfaceContainerHigh
+                opacity: 0.5
+            }
+
+            Row {
+                anchors.left: parent.left
+                anchors.leftMargin: Theme.spacingM
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Theme.spacingS
+
+                DankIcon {
+                    name: "edit_note"
+                    size: Theme.iconSize - 2
+                    color: Theme.primary
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: I18n.tr("Notepad")
+                    font.pixelSize: Theme.fontSizeLarge
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+
+            Row {
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.spacingS
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Theme.spacingXS
+
+                DankActionButton {
+                    visible: windowControls.canMaximize
+                    circular: false
+                    iconName: win.maximized ? "fullscreen_exit" : "fullscreen"
+                    iconSize: Theme.iconSize - 4
+                    iconColor: Theme.surfaceText
+                    onClicked: windowControls.tryToggleMaximize()
+                }
+
+                DankActionButton {
+                    circular: false
+                    iconName: "close"
+                    iconSize: Theme.iconSize - 4
+                    iconColor: Theme.surfaceText
+                    onClicked: win.hide()
+                }
+            }
+        }
+
+        Notepad {
+            id: notepad
+            anchors.top: titleBar.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+            anchors.topMargin: Theme.spacingM
+            anchors.leftMargin: Theme.spacingM
+            anchors.rightMargin: Theme.spacingM
+            anchors.bottomMargin: Theme.spacingM
+            inPopout: true
+            surfaceVisible: win.visible
+            onHideRequested: win.hide()
+            onDockRequested: {
+                win.hide();
+                PopoutService.openNotepadSlideout();
+            }
+        }
+    }
+
+    FloatingWindowControls {
+        id: windowControls
+        targetWindow: win
+    }
+}

quickshell/Modules/Notepad/NotepadSettings.qml

@@ -10,6 +10,7 @@ Item {
     property var cachedFontFamilies: []
     property var cachedMonoFamilies: []
     property bool fontsEnumerated: false
+    property bool shortcutsExpanded: false
 
     signal settingsRequested
     signal findRequested
@@ -62,11 +63,23 @@ Item {
         }
     }
 
-    MouseArea {
+    Rectangle {
         anchors.fill: parent
         visible: root.isVisible
-        onClicked: root.settingsRequested()
         z: 50
+        color: Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, 0.85)
+
+        WheelHandler {
+            // Hold scroll so the editor beneath doesn't move while settings are open.
+            onWheel: event => {
+                event.accepted = true;
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.settingsRequested()
+        }
     }
 
     Rectangle {
@@ -74,8 +87,8 @@ Item {
         visible: root.isVisible
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
-        width: 360
-        height: settingsColumn.implicitHeight + Theme.spacingXL * 2
+        width: Math.min(360, root.width - Theme.spacingL * 2)
+        height: Math.min(settingsColumn.implicitHeight + Theme.spacingXL * 2, root.height - Theme.spacingL * 2)
         radius: Theme.cornerRadius
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, Theme.notepadTransparency)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
@@ -93,274 +106,458 @@ Item {
             z: parent.z - 1
         }
 
-        Column {
-            id: settingsColumn
-            width: parent.width - Theme.spacingXL * 2
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.top
-            anchors.topMargin: Theme.spacingXL
-            spacing: Theme.spacingS
+        DankFlickable {
+            id: settingsFlickable
+            anchors.fill: parent
+            clip: true
+            contentWidth: width
+            contentHeight: settingsColumn.implicitHeight + Theme.spacingXL * 2
 
-            Rectangle {
-                width: parent.width
-                height: 36
-                color: "transparent"
+            Column {
+                id: settingsColumn
+                x: Theme.spacingXL
+                y: Theme.spacingXL
+                width: settingsFlickable.width - Theme.spacingXL * 2
+                spacing: Theme.spacingS
 
-                StyledText {
-                    anchors.left: parent.left
-                    anchors.leftMargin: -Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: I18n.tr("Notepad Font Settings")
-                    font.pixelSize: Theme.fontSizeMedium
-                    font.weight: Font.Medium
-                    color: Theme.surfaceText
-                }
-            }
-
-            Rectangle {
-                width: parent.width
-                height: 1
-                color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-            }
-
-            DankToggle {
-                anchors.left: parent.left
-                anchors.leftMargin: -Theme.spacingM
-                width: parent.width + Theme.spacingM
-                text: I18n.tr("Use Monospace Font")
-                description: I18n.tr("Toggle fonts")
-                checked: SettingsData.notepadUseMonospace
-                onToggled: checked => {
-                    SettingsData.notepadUseMonospace = checked;
-                }
-            }
-
-            DankToggle {
-                anchors.left: parent.left
-                anchors.leftMargin: -Theme.spacingM
-                width: parent.width + Theme.spacingM
-                text: I18n.tr("Show Line Numbers")
-                description: I18n.tr("Display line numbers in editor")
-                checked: SettingsData.notepadShowLineNumbers
-                onToggled: checked => {
-                    SettingsData.notepadShowLineNumbers = checked;
-                }
-            }
-
-            StyledRect {
-                width: parent.width
-                height: 60
-                radius: Theme.cornerRadius
-                color: "transparent"
-
-                StateLayer {
-                    anchors.fill: parent
-                    anchors.leftMargin: -Theme.spacingM
-                    width: parent.width + Theme.spacingM
-                    stateColor: Theme.primary
-                    cornerRadius: parent.radius
-                    onClicked: root.findRequested()
-                }
-
-                Row {
-                    anchors.left: parent.left
-                    anchors.leftMargin: -Theme.spacingM
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.spacingM
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingM
-
-                    DankIcon {
-                        name: "search"
-                        size: Theme.iconSize - 2
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    Column {
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: I18n.tr("Find in Text")
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Open search bar to find text")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                width: parent.width
-                height: visible ? (fontDropdown.height + Theme.spacingS) : 0
-                color: "transparent"
-                visible: !SettingsData.notepadUseMonospace
-
-                DankDropdown {
-                    id: fontDropdown
-                    anchors.left: parent.left
-                    anchors.leftMargin: -Theme.spacingM
-                    width: parent.width + Theme.spacingM
-                    text: I18n.tr("Font Family")
-                    options: cachedFontFamilies
-                    currentValue: {
-                        if (!SettingsData.notepadFontFamily || SettingsData.notepadFontFamily === "")
-                            return I18n.tr("Default (Global)");
-                        else
-                            return SettingsData.notepadFontFamily;
-                    }
-                    enableFuzzySearch: true
-                    onValueChanged: value => {
-                        if (value && (value.startsWith("Default") || value === "Default (Global)")) {
-                            SettingsData.notepadFontFamily = "";
-                        } else {
-                            SettingsData.notepadFontFamily = value;
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                width: parent.width
-                height: fontSizeRow.height + Theme.spacingS
-                color: "transparent"
-
-                Row {
-                    id: fontSizeRow
+                Rectangle {
                     width: parent.width
-                    spacing: Theme.spacingS
+                    height: 36
+                    color: "transparent"
 
-                    Column {
-                        width: parent.width - fontSizeControls.width - Theme.spacingM
-                        spacing: Theme.spacingXS
+                    StyledText {
+                        anchors.left: parent.left
+                        anchors.leftMargin: -Theme.spacingXS
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: I18n.tr("Notepad Settings")
+                        font.pixelSize: Theme.fontSizeMedium
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                    }
+                }
 
-                        StyledText {
-                            text: I18n.tr("Font Size")
-                            font.pixelSize: Theme.fontSizeSmall
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                        }
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+                }
 
-                        StyledText {
-                            text: SettingsData.notepadFontSize + "px"
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                            width: parent.width
-                        }
+                DankToggle {
+                    anchors.left: parent.left
+                    anchors.leftMargin: -Theme.spacingM
+                    width: parent.width + Theme.spacingM
+                    text: I18n.tr("Use Monospace Font")
+                    description: I18n.tr("Toggle fonts")
+                    checked: SettingsData.notepadUseMonospace
+                    onToggled: checked => {
+                        SettingsData.notepadUseMonospace = checked;
+                    }
+                }
+
+                DankToggle {
+                    anchors.left: parent.left
+                    anchors.leftMargin: -Theme.spacingM
+                    width: parent.width + Theme.spacingM
+                    text: I18n.tr("Show Line Numbers")
+                    description: I18n.tr("Display line numbers in editor")
+                    checked: SettingsData.notepadShowLineNumbers
+                    onToggled: checked => {
+                        SettingsData.notepadShowLineNumbers = checked;
+                    }
+                }
+
+                DankToggle {
+                    anchors.left: parent.left
+                    anchors.leftMargin: -Theme.spacingM
+                    width: parent.width + Theme.spacingM
+                    text: I18n.tr("Auto-save to disk")
+                    description: I18n.tr("Automatically save changes to opened files as you type")
+                    checked: SettingsData.notepadAutoSave
+                    onToggled: checked => {
+                        SettingsData.notepadAutoSave = checked;
+                    }
+                }
+
+                StyledRect {
+                    width: parent.width
+                    height: 60
+                    radius: Theme.cornerRadius
+                    color: "transparent"
+
+                    StateLayer {
+                        anchors.fill: parent
+                        anchors.leftMargin: -Theme.spacingM
+                        width: parent.width + Theme.spacingM
+                        stateColor: Theme.primary
+                        cornerRadius: parent.radius
+                        onClicked: root.findRequested()
                     }
 
                     Row {
-                        id: fontSizeControls
-                        spacing: Theme.spacingS
+                        anchors.left: parent.left
+                        anchors.leftMargin: -Theme.spacingM
+                        anchors.right: parent.right
+                        anchors.rightMargin: Theme.spacingM
                         anchors.verticalCenter: parent.verticalCenter
+                        spacing: Theme.spacingM
 
-                        DankActionButton {
-                            buttonSize: 32
-                            iconName: "remove"
-                            iconSize: Theme.iconSizeSmall
-                            enabled: SettingsData.notepadFontSize > 8
-                            backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
-                            iconColor: Theme.surfaceText
-                            onClicked: {
-                                var newSize = Math.max(8, SettingsData.notepadFontSize - 1);
-                                SettingsData.notepadFontSize = newSize;
-                            }
+                        DankIcon {
+                            name: "search"
+                            size: Theme.iconSize - 2
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
                         }
 
-                        Rectangle {
-                            width: 60
-                            height: 32
-                            radius: Theme.cornerRadius
-                            color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                            border.width: 1
+                        Column {
+                            anchors.verticalCenter: parent.verticalCenter
+                            spacing: Theme.spacingXS
 
                             StyledText {
-                                anchors.centerIn: parent
-                                text: SettingsData.notepadFontSize + "px"
+                                text: I18n.tr("Find in Text")
+                                font.pixelSize: Theme.fontSizeMedium
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                            }
+
+                            StyledText {
+                                text: I18n.tr("Open search bar to find text")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                            }
+                        }
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: visible ? (fontDropdown.height + Theme.spacingS) : 0
+                    color: "transparent"
+                    visible: !SettingsData.notepadUseMonospace
+
+                    DankDropdown {
+                        id: fontDropdown
+                        anchors.left: parent.left
+                        anchors.leftMargin: -Theme.spacingM
+                        width: parent.width + Theme.spacingM
+                        text: I18n.tr("Font Family")
+                        options: cachedFontFamilies
+                        currentValue: {
+                            if (!SettingsData.notepadFontFamily || SettingsData.notepadFontFamily === "")
+                                return I18n.tr("Default (Global)");
+                            else
+                                return SettingsData.notepadFontFamily;
+                        }
+                        enableFuzzySearch: true
+                        onValueChanged: value => {
+                            if (value && (value.startsWith("Default") || value === "Default (Global)")) {
+                                SettingsData.notepadFontFamily = "";
+                            } else {
+                                SettingsData.notepadFontFamily = value;
+                            }
+                        }
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: fontSizeRow.height + Theme.spacingS
+                    color: "transparent"
+
+                    Row {
+                        id: fontSizeRow
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        Column {
+                            width: parent.width - fontSizeControls.width - Theme.spacingM
+                            spacing: Theme.spacingXS
+
+                            StyledText {
+                                text: I18n.tr("Font Size")
                                 font.pixelSize: Theme.fontSizeSmall
                                 font.weight: Font.Medium
                                 color: Theme.surfaceText
                             }
+
+                            StyledText {
+                                text: SettingsData.notepadFontSize + "px"
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                width: parent.width
+                            }
                         }
 
-                        DankActionButton {
-                            buttonSize: 32
-                            iconName: "add"
-                            iconSize: Theme.iconSizeSmall
-                            enabled: SettingsData.notepadFontSize < 48
-                            backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
-                            iconColor: Theme.surfaceText
-                            onClicked: {
-                                var newSize = Math.min(48, SettingsData.notepadFontSize + 1);
-                                SettingsData.notepadFontSize = newSize;
+                        Row {
+                            id: fontSizeControls
+                            spacing: Theme.spacingS
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            DankActionButton {
+                                buttonSize: 32
+                                iconName: "remove"
+                                iconSize: Theme.iconSizeSmall
+                                enabled: SettingsData.notepadFontSize > 8
+                                backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
+                                iconColor: Theme.surfaceText
+                                onClicked: {
+                                    var newSize = Math.max(8, SettingsData.notepadFontSize - 1);
+                                    SettingsData.notepadFontSize = newSize;
+                                }
+                            }
+
+                            Rectangle {
+                                width: 60
+                                height: 32
+                                radius: Theme.cornerRadius
+                                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+                                border.width: 1
+
+                                StyledText {
+                                    anchors.centerIn: parent
+                                    text: SettingsData.notepadFontSize + "px"
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    font.weight: Font.Medium
+                                    color: Theme.surfaceText
+                                }
+                            }
+
+                            DankActionButton {
+                                buttonSize: 32
+                                iconName: "add"
+                                iconSize: Theme.iconSizeSmall
+                                enabled: SettingsData.notepadFontSize < 48
+                                backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
+                                iconColor: Theme.surfaceText
+                                onClicked: {
+                                    var newSize = Math.min(48, SettingsData.notepadFontSize + 1);
+                                    SettingsData.notepadFontSize = newSize;
+                                }
                             }
                         }
                     }
                 }
-            }
 
-            Rectangle {
-                width: parent.width
-                height: transparencySliderColumn.height + Theme.spacingS
-                color: "transparent"
-
-                Column {
-                    id: transparencySliderColumn
+                Rectangle {
                     width: parent.width
-                    spacing: Theme.spacingS
+                    height: transparencySliderColumn.height + Theme.spacingS
+                    color: "transparent"
 
-                    DankToggle {
-                        anchors.left: parent.left
-                        anchors.leftMargin: -Theme.spacingM
-                        width: parent.width + Theme.spacingM
-                        text: I18n.tr("Custom Transparency")
-                        description: I18n.tr("Override global transparency for Notepad")
-                        checked: SettingsData.notepadTransparencyOverride >= 0
-                        onToggled: checked => {
-                            if (checked) {
-                                SettingsData.notepadTransparencyOverride = SettingsData.notepadLastCustomTransparency;
-                            } else {
-                                SettingsData.notepadTransparencyOverride = -1;
+                    Column {
+                        id: transparencySliderColumn
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        DankToggle {
+                            anchors.left: parent.left
+                            anchors.leftMargin: -Theme.spacingM
+                            width: parent.width + Theme.spacingM
+                            text: I18n.tr("Surface Opacity")
+                            description: I18n.tr("Override global transparency for Notepad")
+                            checked: SettingsData.notepadTransparencyOverride >= 0
+                            onToggled: checked => {
+                                if (checked) {
+                                    SettingsData.notepadTransparencyOverride = SettingsData.notepadLastCustomTransparency;
+                                } else {
+                                    SettingsData.notepadTransparencyOverride = -1;
+                                }
                             }
                         }
-                    }
 
-                    DankSlider {
-                        anchors.left: parent.left
-                        anchors.leftMargin: -Theme.spacingM
-                        width: parent.width + Theme.spacingM
-                        height: 24
-                        visible: SettingsData.notepadTransparencyOverride >= 0
-                        value: Math.round((SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : SettingsData.popupTransparency) * 100)
-                        minimum: 0
-                        maximum: 100
-                        unit: ""
-                        showValue: true
-                        wheelEnabled: false
-                        onSliderValueChanged: newValue => {
-                            if (SettingsData.notepadTransparencyOverride >= 0) {
-                                SettingsData.notepadTransparencyOverride = newValue / 100;
+                        DankSlider {
+                            anchors.left: parent.left
+                            anchors.leftMargin: -Theme.spacingM
+                            width: parent.width + Theme.spacingM
+                            height: 24
+                            visible: SettingsData.notepadTransparencyOverride >= 0
+                            value: Math.round((SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : SettingsData.popupTransparency) * 100)
+                            minimum: 0
+                            maximum: 100
+                            unit: ""
+                            showValue: true
+                            wheelEnabled: false
+                            onSliderValueChanged: newValue => {
+                                if (SettingsData.notepadTransparencyOverride >= 0) {
+                                    SettingsData.notepadTransparencyOverride = newValue / 100;
+                                }
                             }
                         }
                     }
                 }
-            }
 
-            StyledText {
-                width: parent.width
-                text: SettingsData.notepadUseMonospace ? I18n.tr("Using global monospace font from Settings → Personalization") : I18n.tr("Global fonts can be configured in Settings → Personalization")
-                font.pixelSize: Theme.fontSizeSmall
-                color: Theme.surfaceTextMedium
-                wrapMode: Text.WordWrap
-                opacity: 0.8
+                Rectangle {
+                    width: parent.width
+                    height: gapColumn.height + Theme.spacingS
+                    color: "transparent"
+
+                    Column {
+                        id: gapColumn
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        Column {
+                            width: parent.width
+                            spacing: Theme.spacingXS
+
+                            StyledText {
+                                text: I18n.tr("Default Mode")
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                            }
+
+                            DankButtonGroup {
+                                model: [I18n.tr("Slideout"), I18n.tr("Popout")]
+                                size: "small"
+                                currentIndex: SettingsData.notepadDefaultMode === "popout" ? 1 : 0
+                                onSelectionChanged: (index, selected) => {
+                                    if (!selected)
+                                        return;
+                                    SettingsData.notepadDefaultMode = index === 1 ? "popout" : "slideout";
+                                }
+                            }
+                        }
+
+                        Column {
+                            width: parent.width
+                            spacing: Theme.spacingXS
+                            visible: SettingsData.notepadDefaultMode !== "popout"
+
+                            StyledText {
+                                text: I18n.tr("Open From")
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                            }
+
+                            DankButtonGroup {
+                                model: [I18n.tr("Right"), I18n.tr("Left")]
+                                size: "small"
+                                currentIndex: SettingsData.notepadSlideoutSide === "left" ? 1 : 0
+                                onSelectionChanged: (index, selected) => {
+                                    if (!selected)
+                                        return;
+                                    SettingsData.notepadSlideoutSide = index === 1 ? "left" : "right";
+                                }
+                            }
+                        }
+
+                        DankToggle {
+                            anchors.left: parent.left
+                            anchors.leftMargin: -Theme.spacingM
+                            width: parent.width + Theme.spacingM
+                            text: I18n.tr("Auto Compositor Gaps")
+                            description: I18n.tr("Inset the Notepad from screen edges using the compositor's configured gaps")
+                            checked: SettingsData.notepadUseCompositorGap
+                            onToggled: checked => {
+                                SettingsData.notepadUseCompositorGap = checked;
+                            }
+                        }
+
+                        StyledText {
+                            visible: !SettingsData.notepadUseCompositorGap
+                            text: I18n.tr("Manual Gaps")
+                            font.pixelSize: Theme.fontSizeSmall
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                        }
+
+                        DankSlider {
+                            anchors.left: parent.left
+                            anchors.leftMargin: Theme.spacingXS
+                            width: parent.width - Theme.spacingXS * 2
+                            height: 24
+                            visible: !SettingsData.notepadUseCompositorGap
+                            value: SettingsData.notepadEdgeGap
+                            minimum: 0
+                            maximum: 64
+                            unit: "px"
+                            showValue: true
+                            wheelEnabled: false
+                            onSliderValueChanged: newValue => {
+                                SettingsData.notepadEdgeGap = newValue;
+                            }
+                        }
+                    }
+                }
+
+                StyledText {
+                    width: parent.width
+                    text: SettingsData.notepadUseMonospace ? I18n.tr("Using global monospace font from Settings → Personalization") : I18n.tr("Global fonts can be configured in Settings → Personalization")
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceTextMedium
+                    wrapMode: Text.WordWrap
+                    opacity: 0.8
+                }
+
+                StyledRect {
+                    width: parent.width
+                    implicitHeight: shortcutsHeader.height + (root.shortcutsExpanded ? shortcutsColumn.implicitHeight + Theme.spacingM : 0)
+                    radius: Theme.cornerRadius
+                    color: root.shortcutsExpanded ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : "transparent"
+                    border.color: root.shortcutsExpanded ? Theme.primary : Theme.outlineMedium
+                    border.width: root.shortcutsExpanded ? 2 : 1
+
+                    StateLayer {
+                        anchors.fill: parent
+                        stateColor: Theme.primary
+                        cornerRadius: parent.radius
+                        onClicked: root.shortcutsExpanded = !root.shortcutsExpanded
+                    }
+
+                    Row {
+                        id: shortcutsHeader
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.leftMargin: Theme.spacingM
+                        anchors.rightMargin: Theme.spacingS
+                        height: 36
+                        spacing: Theme.spacingS
+
+                        DankIcon {
+                            name: root.shortcutsExpanded ? "expand_less" : "expand_more"
+                            size: Theme.iconSizeSmall
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Keyboard Shortcuts")
+                            font.pixelSize: Theme.fontSizeSmall
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    Column {
+                        id: shortcutsColumn
+                        visible: root.shortcutsExpanded
+                        width: parent.width - Theme.spacingL * 2
+                        anchors.top: shortcutsHeader.bottom
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        spacing: 2
+
+                        StyledText {
+                            width: parent.width
+                            text: I18n.tr("Ctrl+S: Save • Ctrl+O: Open • Ctrl+N: New • Ctrl+F: Find")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceText
+                            wrapMode: Text.WordWrap
+                            horizontalAlignment: Text.AlignHCenter
+                        }
+
+                        StyledText {
+                            width: parent.width
+                            text: I18n.tr("Ctrl+A: Select All • Ctrl+P: Preview • Enter/Shift+Enter: Find Next/Previous • Esc: Close")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceText
+                            wrapMode: Text.WordWrap
+                            horizontalAlignment: Text.AlignHCenter
+                        }
+                    }
+                }
             }
         }
     }

quickshell/Modules/Notepad/NotepadTextEditor.qml

@@ -32,6 +32,23 @@ Column {
     property string pluginHighlightedHtml: ""
     property string lastPluginContent: ""
     property int loadRequestId: 0
+    property bool ignoreNextExternalChange: false
+    property bool watcherReloadPending: false
+    property bool externalWatchPaused: false
+    property bool inPopout: false
+    property bool surfaceVisible: true
+    // Tab ids are Date.now() timestamps (~1.78e12) which overflow a 32-bit `int`,
+    // corrupting the value (e.g. -946062153) and breaking buffer keying. `var`
+    // holds the full JS-safe integer.
+    property var loadedTabId: -1
+    property bool applyingShared: false
+    property bool showPathInfo: false
+
+    function currentFilePath() {
+        if (!currentTab)
+            return "";
+        return currentTab.isTemporary ? (NotepadStorageService.baseDir + "/" + currentTab.filePath) : currentTab.filePath;
+    }
 
     signal saveRequested
     signal openRequested
@@ -40,6 +57,10 @@ Column {
     signal escapePressed
     signal contentChanged
     signal settingsRequested
+    signal popoutRequested
+    signal dockRequested
+    signal conflictDetected(string diskContent)
+    signal autoSaveRequested
 
     function hasUnsavedChanges() {
         if (!currentTab || !contentLoaded) {
@@ -52,6 +73,12 @@ Column {
         return textArea.text !== lastSavedContent;
     }
 
+    function commitLiveBuffer() {
+        if (loadedTabId < 0 || !contentLoaded)
+            return;
+        NotepadStorageService.setSessionBuffer(loadedTabId, textArea.text, lastSavedContent);
+    }
+
     function loadCurrentTabContent() {
         if (!currentTab)
             return;
@@ -62,8 +89,25 @@ Column {
             const activeTab = NotepadStorageService.tabs.length > NotepadStorageService.currentTabIndex ? NotepadStorageService.tabs[NotepadStorageService.currentTabIndex] : null;
             if (requestId !== loadRequestId || !activeTab || activeTab.id !== requestedTabId)
                 return;
+
+            const buffer = NotepadStorageService.getSessionBuffer(requestedTabId);
+            if (buffer !== undefined) {
+                applyingShared = true;
+                lastSavedContent = buffer.baseline;
+                textArea.text = buffer.content;
+                applyingShared = false;
+                loadedTabId = requestedTabId;
+                contentLoaded = true;
+                syncContentToPlugin();
+                applyDiskContent(content);
+                return;
+            }
+
+            applyingShared = true;
             lastSavedContent = content;
             textArea.text = content;
+            applyingShared = false;
+            loadedTabId = requestedTabId;
             contentLoaded = true;
             syncContentToPlugin();
         });
@@ -72,14 +116,56 @@ Column {
     function saveCurrentTabContent() {
         if (!currentTab || !contentLoaded)
             return;
+        if (!currentTab.isTemporary)
+            return;
         NotepadStorageService.saveTabContent(NotepadStorageService.currentTabIndex, textArea.text);
         lastSavedContent = textArea.text;
+        NotepadStorageService.clearSessionBuffer(loadedTabId);
     }
 
     function autoSaveToSession() {
+        commitLiveBuffer();
         if (!currentTab || !contentLoaded)
             return;
-        saveCurrentTabContent();
+        if (currentTab.isTemporary) {
+            saveCurrentTabContent();
+        } else if (SettingsData.notepadAutoSave) {
+            root.autoSaveRequested();
+        }
+    }
+
+    function syncFromDisk() {
+        if (!currentTab)
+            return;
+        loadCurrentTabContent();
+    }
+
+    function applyDiskContent(diskContent) {
+        if (diskContent === undefined || diskContent === null)
+            return;
+        if (diskContent === textArea.text) {
+            lastSavedContent = diskContent;
+            return;
+        }
+        if (diskContent === lastSavedContent) {
+            return;
+        }
+        if (textArea.text === lastSavedContent) {
+            reloadFromDisk(diskContent);
+        } else if (surfaceVisible) {
+            conflictDetected(diskContent);
+        }
+    }
+
+    function reloadFromDisk(diskContent) {
+        applyingShared = true;
+        contentLoaded = false;
+        textArea.text = diskContent;
+        lastSavedContent = diskContent;
+        contentLoaded = true;
+        applyingShared = false;
+        NotepadStorageService.clearSessionBuffer(loadedTabId);
+        syncContentToPlugin();
     }
 
     function setTextDocumentLineHeight() {
@@ -202,7 +288,8 @@ Column {
         if (!currentTab)
             return;
         const filePath = currentTab?.filePath || "";
-        const ext = filePath.split('.').pop().toLowerCase();
+        const baseName = filePath.split('/').pop();
+        const ext = baseName.includes('.') ? baseName.split('.').pop().toLowerCase() : "";
         const content = textArea.text;
 
         if (content === lastPluginContent && SettingsData.getBuiltInPluginSetting("dankNotepadModule", "previewActive", false) === inlinePreviewVisible) {
@@ -550,6 +637,7 @@ Column {
                         Connections {
                             target: NotepadStorageService
                             function onCurrentTabIndexChanged() {
+                                root.commitLiveBuffer();
                                 loadCurrentTabContent();
                                 Qt.callLater(() => {
                                     textArea.forceActiveFocus();
@@ -570,7 +658,9 @@ Column {
                         }
 
                         onTextChanged: {
-                            if (contentLoaded && text !== lastSavedContent) {
+                            // Debounced flush to the shared buffer (+ optional disk
+                            // autosave) for every loaded tab, not just scratch notes.
+                            if (contentLoaded && !applyingShared) {
                                 autoSaveTimer.restart();
                             }
                             root.contentChanged();
@@ -744,6 +834,7 @@ Column {
         spacing: Theme.spacingS
 
         Item {
+            id: buttonBarItem
             width: parent.width
             height: 32
 
@@ -820,17 +911,98 @@ Column {
                 }
             }
 
-            DankActionButton {
+            Row {
+                id: rightButtonRow
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                iconName: "more_horiz"
-                iconSize: Theme.iconSize - 2
-                iconColor: Theme.surfaceText
-                onClicked: root.settingsRequested()
+                spacing: Theme.spacingS
+
+                DankActionButton {
+                    visible: !root.inPopout
+                    iconName: "open_in_new"
+                    iconSize: Theme.iconSize - 2
+                    iconColor: Theme.surfaceText
+                    onClicked: root.popoutRequested()
+                }
+
+                DankActionButton {
+                    visible: root.inPopout
+                    iconName: "dock_to_right"
+                    iconSize: Theme.iconSize - 2
+                    iconColor: Theme.surfaceText
+                    onClicked: root.dockRequested()
+                }
+
+                DankActionButton {
+                    iconName: "more_horiz"
+                    iconSize: Theme.iconSize - 2
+                    iconColor: Theme.surfaceText
+                    onClicked: root.settingsRequested()
+                }
+            }
+
+            StyledRect {
+                id: pathInfoPopup
+                visible: root.showPathInfo
+                anchors.right: parent.right
+                anchors.bottom: parent.top
+                anchors.bottomMargin: Theme.spacingS
+                width: Math.min(root.width, 360)
+                height: pathInfoRow.implicitHeight + Theme.spacingS * 2
+                radius: Theme.cornerRadius
+                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+                border.color: Theme.outlineMedium
+                border.width: 1
+                z: 10
+
+                Row {
+                    id: pathInfoRow
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.leftMargin: Theme.spacingM
+                    anchors.rightMargin: Theme.spacingM
+                    spacing: Theme.spacingS
+
+                    DankIcon {
+                        name: currentTab && currentTab.isTemporary ? "draft" : "description"
+                        size: Theme.iconSize - 4
+                        color: Theme.surfaceVariantText
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    StyledText {
+                        width: pathInfoRow.width - (Theme.iconSize - 4) - copyPathButton.width - Theme.spacingS * 2
+                        text: root.currentFilePath()
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceText
+                        elide: Text.ElideMiddle
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    DankActionButton {
+                        id: copyPathButton
+                        iconName: "content_copy"
+                        iconSize: Theme.iconSize - 6
+                        iconColor: Theme.surfaceTextMedium
+                        anchors.verticalCenter: parent.verticalCenter
+                        onClicked: {
+                            const proc = clipboardCopyProcComp.createObject(root, {
+                                content: root.currentFilePath(),
+                                running: true
+                            });
+                            proc.exited.connect(() => {
+                                ToastService.showInfo(I18n.tr("Path copied to clipboard"));
+                                proc.destroy();
+                            });
+                        }
+                    }
+                }
             }
         }
 
         Row {
+            id: statusRow
             width: parent.width
             spacing: Theme.spacingL
 
@@ -853,35 +1025,46 @@ Column {
                 opacity: 1.0
             }
 
-            StyledText {
-                text: {
-                    if (autoSaveTimer.running) {
-                        return I18n.tr("Auto-saving...");
-                    }
+            Row {
+                visible: textArea.text.length > 0
+                spacing: Theme.spacingXS
 
-                    if (hasUnsavedChanges()) {
-                        if (currentTab && currentTab.isTemporary) {
-                            return I18n.tr("Unsaved note...");
-                        } else {
-                            return I18n.tr("Unsaved changes");
+                StyledText {
+                    anchors.verticalCenter: parent.verticalCenter
+                    readonly property bool savingToDisk: autoSaveTimer.running && currentTab && (currentTab.isTemporary || SettingsData.notepadAutoSave)
+                    text: {
+                        if (savingToDisk) {
+                            return I18n.tr("Saving...");
                         }
-                    } else {
-                        return I18n.tr("Saved");
-                    }
-                }
-                font.pixelSize: Theme.fontSizeSmall
-                color: {
-                    if (autoSaveTimer.running) {
-                        return Theme.primary;
-                    }
 
-                    if (hasUnsavedChanges()) {
-                        return Theme.warning;
-                    } else {
-                        return Theme.success;
+                        if (currentTab && currentTab.isTemporary) {
+                            return I18n.tr("Auto saved");
+                        }
+
+                        return hasUnsavedChanges() ? I18n.tr("Unsaved changes") : I18n.tr("Saved");
+                    }
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: {
+                        if (savingToDisk) {
+                            return Theme.primary;
+                        }
+
+                        if (currentTab && currentTab.isTemporary) {
+                            return Theme.success;
+                        }
+
+                        return hasUnsavedChanges() ? Theme.warning : Theme.success;
                     }
                 }
-                opacity: textArea.text.length > 0 ? 1.0 : 0.0
+
+                DankActionButton {
+                    anchors.verticalCenter: parent.verticalCenter
+                    iconName: "info"
+                    iconSize: Theme.iconSizeSmall
+                    iconColor: root.showPathInfo ? Theme.primary : Theme.surfaceTextMedium
+                    buttonSize: 20
+                    onClicked: root.showPathInfo = !root.showPathInfo
+                }
             }
         }
     }
@@ -902,6 +1085,38 @@ Column {
         onTriggered: syncContentToPlugin()
     }
 
+    FileView {
+        id: externalWatch
+        path: (!root.externalWatchPaused && currentTab && !currentTab.isTemporary && currentTab.filePath) ? currentTab.filePath : ""
+        blockLoading: true
+        preload: true
+        watchChanges: true
+
+        onFileChanged: {
+            root.watcherReloadPending = true;
+            reload();
+        }
+
+        onLoaded: {
+            if (root.ignoreNextExternalChange) {
+                root.ignoreNextExternalChange = false;
+                root.lastSavedContent = externalWatch.text();
+                root.watcherReloadPending = false;
+                return;
+            }
+            if (!root.watcherReloadPending)
+                return;
+            root.watcherReloadPending = false;
+            if (!root.contentLoaded || !root.currentTab || root.currentTab.isTemporary)
+                return;
+            if (!root.surfaceVisible)
+                return;
+            root.applyDiskContent(externalWatch.text());
+        }
+
+        onLoadFailed: error => {}
+    }
+
     Connections {
         target: SettingsData
         function onBuiltInPluginSettingsChanged() {
@@ -910,4 +1125,24 @@ Column {
             }
         }
     }
+
+    Connections {
+        target: NotepadStorageService
+        function onSessionBufferRevisionChanged() {
+            if (applyingShared || !contentLoaded || loadedTabId < 0)
+                return;
+            if (textArea.activeFocus)
+                return;
+            var buffer = NotepadStorageService.getSessionBuffer(loadedTabId);
+            if (buffer === undefined || buffer.content === textArea.text)
+                return;
+            if (textArea.text === lastSavedContent) {
+                applyingShared = true;
+                lastSavedContent = buffer.baseline;
+                textArea.text = buffer.content;
+                applyingShared = false;
+                syncContentToPlugin();
+            }
+        }
+    }
 }

quickshell/Modules/Notifications/Popup/NotificationPopup.qml

@@ -721,6 +721,51 @@ PanelWindow {
                 }
             }
 
+            // Timeout progress bar: drains as the dismiss timer runs; inset by
+            // the corner radius and frozen while hovered or during exit.
+            Rectangle {
+                id: timeoutBar
+
+                readonly property bool active: SettingsData.notificationShowTimeoutBar && notificationData && notificationData.timer && notificationData.timer.interval > 0
+                property real progress: 1
+                readonly property real surfaceRadius: win.connectedFrameMode ? Theme.connectedSurfaceRadius : Theme.cornerRadius
+
+                visible: active && progress > 0
+                anchors.left: parent.left
+                anchors.leftMargin: surfaceRadius
+                anchors.bottom: parent.bottom
+                width: Math.max(0, parent.width - surfaceRadius * 2) * progress
+                height: Math.max(2, Theme.snap(3, win.dpr))
+                radius: height / 2
+                z: 50
+                opacity: 0.9
+                color: notificationData && notificationData.urgency === NotificationUrgency.Critical ? Theme.error : Theme.primary
+
+                NumberAnimation {
+                    id: progressAnim
+                    target: timeoutBar
+                    property: "progress"
+                    from: 1
+                    to: 0
+                    duration: (notificationData && notificationData.timer && notificationData.timer.interval > 0) ? notificationData.timer.interval : 5000
+                    running: timeoutBar.active && notificationData && notificationData.timer && notificationData.timer.running && !win.exiting
+                    easing.type: Easing.Linear
+                }
+
+                // Reset to full on every (re)start, including an in-place
+                // restart on a deduped notification (running stays true, so the
+                // bound animation alone wouldn't re-fire).
+                Connections {
+                    target: timeoutBar.active ? notificationData.timer : null
+                    function onRunningChanged() {
+                        if (notificationData && notificationData.timer && notificationData.timer.running && !win.exiting) {
+                            timeoutBar.progress = 1;
+                            progressAnim.restart();
+                        }
+                    }
+                }
+            }
+
             LayoutMirroring.enabled: I18n.isRtl
             LayoutMirroring.childrenInherit: true
 
@@ -871,10 +916,11 @@ PanelWindow {
                         }
                     }
 
+
                     StyledText {
                         text: notificationData ? (notificationData.summary || "") : ""
                         color: Theme.surfaceText
-                        font.pixelSize: Theme.fontSizeMedium
+                        font.pixelSize: SettingsData.notificationSummaryFontSize || Theme.fontSizeMedium
                         font.weight: Font.Medium
                         width: parent.width
                         elide: Text.ElideRight
@@ -890,7 +936,7 @@ PanelWindow {
                         text: notificationData ? (notificationData.htmlBody || "") : ""
                         textFormat: Text.StyledText
                         color: Theme.surfaceVariantText
-                        font.pixelSize: Theme.fontSizeSmall
+                        font.pixelSize: SettingsData.notificationBodyFontSize || Theme.fontSizeSmall
                         width: parent.width
                         elide: descriptionExpanded ? Text.ElideNone : Text.ElideRight
                         horizontalAlignment: Text.AlignLeft

quickshell/Modules/Settings/AboutTab.qml

@@ -15,7 +15,7 @@ Item {
     property bool isSway: CompositorService.isSway
     property bool isScroll: CompositorService.isScroll
     property bool isMiracle: CompositorService.isMiracle
-    property bool isDwl: CompositorService.isDwl || CompositorService.isMango
+    property bool isMango: CompositorService.isMango
     property bool isLabwc: CompositorService.isLabwc
 
     property string compositorName: {
@@ -27,7 +27,7 @@ Item {
             return "scroll";
         if (isMiracle)
             return "miracle";
-        if (isDwl)
+        if (isMango)
             return "mangowc";
         if (isLabwc)
             return "labwc";
@@ -43,7 +43,7 @@ Item {
             return "/assets/sway.svg";
         if (isMiracle)
             return "/assets/miraclewm.svg";
-        if (isDwl)
+        if (isMango)
             return "/assets/mango.png";
         if (isLabwc)
             return "/assets/labwc.png";
@@ -59,7 +59,7 @@ Item {
             return "https://github.com/dawsers/scroll";
         if (isMiracle)
             return "https://github.com/miracle-wm-org/miracle-wm";
-        if (isDwl)
+        if (isMango)
             return "https://github.com/DreamMaoMao/mangowc";
         if (isLabwc)
             return "https://labwc.github.io/";
@@ -75,7 +75,7 @@ Item {
             return I18n.tr("Scroll GitHub");
         if (isMiracle)
             return I18n.tr("Scroll GitHub");
-        if (isDwl)
+        if (isMango)
             return I18n.tr("mangowc GitHub");
         if (isLabwc)
             return I18n.tr("LabWC Website");
@@ -88,7 +88,7 @@ Item {
     property string compositorDiscordUrl: {
         if (isHyprland)
             return "https://discord.com/invite/hQ9XvMUjjr";
-        if (isDwl)
+        if (isMango)
             return "https://discord.gg/CPjbDxesh5";
         return "";
     }
@@ -96,7 +96,7 @@ Item {
     property string compositorDiscordTooltip: {
         if (isHyprland)
             return I18n.tr("Hyprland Discord Server");
-        if (isDwl)
+        if (isMango)
             return I18n.tr("mangowc Discord Server");
         return "";
     }
@@ -107,9 +107,9 @@ Item {
     property string ircUrl: "https://web.libera.chat/gamja/?channels=#labwc"
     property string ircTooltip: I18n.tr("LabWC IRC Channel")
 
-    property bool showMatrix: isNiri && !isHyprland && !isSway && !isScroll && !isMiracle && !isDwl && !isLabwc
-    property bool showCompositorDiscord: isHyprland || isDwl
-    property bool showReddit: isNiri && !isHyprland && !isSway && !isScroll && !isMiracle && !isDwl && !isLabwc
+    property bool showMatrix: isNiri && !isHyprland && !isSway && !isScroll && !isMiracle && !isMango && !isLabwc
+    property bool showCompositorDiscord: isHyprland || isMango
+    property bool showReddit: isNiri && !isHyprland && !isSway && !isScroll && !isMiracle && !isMango && !isLabwc
     property bool showIrc: isLabwc
 
     DankFlickable {

quickshell/Modules/Settings/AutoStartTab.qml

@@ -722,7 +722,7 @@ Item {
 
             SettingsCard {
                 width: parent.width
-                iconName: "system_tray"
+                iconName: "handyman"
                 title: I18n.tr("Tray Icon Fix")
                 visible: DesktopService.isSystemd
 

quickshell/Modules/Settings/ClipboardTab.qml

@@ -152,6 +152,9 @@ Item {
         }
     ]
 
+    readonly property var entryActionKeys: ["pin", "edit", "delete"]
+    readonly property var entryActionLabels: [I18n.tr("Pin"), I18n.tr("Edit"), I18n.tr("Delete")]
+
     function getMaxHistoryText(value) {
         if (value <= 0)
             return "∞";
@@ -187,6 +190,29 @@ Item {
         return value.toString();
     }
 
+    function visibleEntryActionKeys() {
+        return SettingsData.clipboardVisibleEntryActions || ["pin", "edit", "delete"];
+    }
+
+    function visibleEntryActionLabels() {
+        const visibleKeys = visibleEntryActionKeys();
+        return entryActionKeys.map((key, index) => visibleKeys.includes(key) ? entryActionLabels[index] : null).filter(label => label !== null);
+    }
+
+    function setVisibleEntryAction(index, selected) {
+        const actionKey = entryActionKeys[index];
+        if (!actionKey)
+            return;
+
+        let actions = visibleEntryActionKeys().slice();
+        if (selected && !actions.includes(actionKey)) {
+            actions.push(actionKey);
+        } else if (!selected && actions.includes(actionKey)) {
+            actions = actions.filter(action => action !== actionKey);
+        }
+        SettingsData.set("clipboardVisibleEntryActions", actions);
+    }
+
     function loadConfig() {
         configLoaded = false;
         configError = false;
@@ -437,6 +463,24 @@ Item {
                     checked: SettingsData.clipboardEnterToPaste
                     onToggled: checked => SettingsData.set("clipboardEnterToPaste", checked)
                 }
+
+                SettingsButtonGroupRow {
+                    tab: "clipboard"
+                    tags: ["clipboard", "actions", "buttons", "hide", "density", "pin", "edit", "delete"]
+                    settingKey: "clipboardVisibleEntryActions"
+                    text: I18n.tr("Visible Entry Actions")
+                    description: I18n.tr("Choose which action buttons appear on clipboard entries")
+                    selectionMode: "multi"
+                    model: root.entryActionLabels
+                    currentSelection: root.visibleEntryActionLabels()
+                    checkEnabled: false
+                    buttonHeight: 28
+                    minButtonWidth: 56
+                    buttonPadding: Theme.spacingS
+                    textSize: Theme.fontSizeSmall
+                    spacing: 1
+                    onSelectionChanged: (index, selected) => root.setVisibleEntryAction(index, selected)
+                }
             }
 
             SettingsCard {

quickshell/Modules/Settings/CompositorLayoutTab.qml

@@ -23,9 +23,9 @@ Item {
             SettingsCard {
                 width: parent.width
                 tags: ["niri", "layout", "gaps", "radius", "window", "border"]
-                title: I18n.tr("Niri Layout Overrides").replace("Niri", "niri")
+                title: I18n.tr("Niri Layout Overrides")
                 settingKey: "niriLayout"
-                iconName: "crop_square"
+                iconName: "layers"
                 visible: CompositorService.isNiri
 
                 SettingsToggleRow {
@@ -145,7 +145,7 @@ Item {
                     tags: ["hyprland", "gaps", "override"]
                     settingKey: "hyprlandLayoutGapsOverride"
                     text: I18n.tr("Window Gaps")
-                    description: I18n.tr("Space between windows (gaps_in and gaps_out)")
+                    description: I18n.tr("Space between windows") + " (gaps_in/gaps_out)"
                     visible: SettingsData.hyprlandLayoutGapsOverride >= 0
                     value: Math.max(0, SettingsData.hyprlandLayoutGapsOverride)
                     minimum: 0
@@ -159,7 +159,7 @@ Item {
                     tags: ["hyprland", "radius", "override", "rounding"]
                     settingKey: "hyprlandLayoutRadiusOverrideEnabled"
                     text: I18n.tr("Override Corner Radius")
-                    description: I18n.tr("Use custom window rounding instead of theme radius")
+                    description: I18n.tr("Use custom window radius instead of theme radius")
                     checked: SettingsData.hyprlandLayoutRadiusOverride >= 0
                     onToggled: checked => {
                         if (checked) {
@@ -173,8 +173,8 @@ Item {
                 SettingsSliderRow {
                     tags: ["hyprland", "radius", "override", "rounding"]
                     settingKey: "hyprlandLayoutRadiusOverride"
-                    text: I18n.tr("Window Rounding")
-                    description: I18n.tr("Rounded corners for windows (decoration.rounding)")
+                    text: I18n.tr("Window Corner Radius")
+                    description: I18n.tr("Rounded corners for windows") + " (decoration.rounding)"
                     visible: SettingsData.hyprlandLayoutRadiusOverride >= 0
                     value: Math.max(0, SettingsData.hyprlandLayoutRadiusOverride)
                     minimum: 0
@@ -203,7 +203,7 @@ Item {
                     tags: ["hyprland", "border", "override"]
                     settingKey: "hyprlandLayoutBorderSize"
                     text: I18n.tr("Border Size")
-                    description: I18n.tr("Width of window border (general.border_size)")
+                    description: I18n.tr("Width of window border") + " (general.border_size)"
                     visible: SettingsData.hyprlandLayoutBorderSize >= 0
                     value: Math.max(0, SettingsData.hyprlandLayoutBorderSize)
                     minimum: 0
@@ -229,7 +229,7 @@ Item {
                 title: I18n.tr("MangoWC Layout Overrides")
                 settingKey: "mangoLayout"
                 iconName: "crop_square"
-                visible: CompositorService.isDwl || CompositorService.isMango
+                visible: CompositorService.isMango
 
                 SettingsToggleRow {
                     tags: ["mangowc", "mango", "gaps", "override"]
@@ -251,7 +251,7 @@ Item {
                     tags: ["mangowc", "mango", "gaps", "override"]
                     settingKey: "mangoLayoutGapsOverride"
                     text: I18n.tr("Window Gaps")
-                    description: I18n.tr("Space between windows (gappih/gappiv/gappoh/gappov)")
+                    description: I18n.tr("Space between windows") + " (gappih/gappiv/gappoh/gappov)"
                     visible: SettingsData.mangoLayoutGapsOverride >= 0
                     value: Math.max(0, SettingsData.mangoLayoutGapsOverride)
                     minimum: 0
@@ -280,7 +280,7 @@ Item {
                     tags: ["mangowc", "mango", "radius", "override"]
                     settingKey: "mangoLayoutRadiusOverride"
                     text: I18n.tr("Window Corner Radius")
-                    description: I18n.tr("Rounded corners for windows (border_radius)")
+                    description: I18n.tr("Rounded corners for windows") + " (border_radius)"
                     visible: SettingsData.mangoLayoutRadiusOverride >= 0
                     value: Math.max(0, SettingsData.mangoLayoutRadiusOverride)
                     minimum: 0
@@ -309,7 +309,7 @@ Item {
                     tags: ["mangowc", "mango", "border", "override"]
                     settingKey: "mangoLayoutBorderSize"
                     text: I18n.tr("Border Size")
-                    description: I18n.tr("Width of window border (borderpx)")
+                    description: I18n.tr("Width of window border") + " (borderpx)"
                     visible: SettingsData.mangoLayoutBorderSize >= 0
                     value: Math.max(0, SettingsData.mangoLayoutBorderSize)
                     minimum: 0

quickshell/Modules/Settings/CompositorTab.qml

@@ -1,167 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    property int subTabIndex: 0
-
-    readonly property var workspaceSections: ({
-            "workspaceSettings": true,
-            "showWorkspaceIndex": true,
-            "showWorkspaceName": true,
-            "showWorkspacePadding": true,
-            "showWorkspaceApps": true,
-            "groupWorkspaceApps": true,
-            "groupActiveWorkspaceApps": true,
-            "workspaceActiveAppHighlightEnabled": true,
-            "workspaceFollowFocus": true,
-            "showOccupiedWorkspacesOnly": true,
-            "reverseScrolling": true,
-            "workspaceDragReorder": true,
-            "dwlShowAllTags": true,
-            "workspaceIcons": true
-        })
-    readonly property var layoutSections: ({
-            "niriLayout": true,
-            "niriLayoutGapsOverrideEnabled": true,
-            "niriLayoutGapsOverride": true,
-            "niriLayoutRadiusOverrideEnabled": true,
-            "niriLayoutRadiusOverride": true,
-            "niriLayoutBorderSizeEnabled": true,
-            "niriLayoutBorderSize": true,
-            "hyprlandLayout": true,
-            "hyprlandLayoutGapsOverrideEnabled": true,
-            "hyprlandLayoutGapsOverride": true,
-            "hyprlandLayoutRadiusOverrideEnabled": true,
-            "hyprlandLayoutRadiusOverride": true,
-            "hyprlandLayoutBorderSizeEnabled": true,
-            "hyprlandLayoutBorderSize": true,
-            "hyprlandResizeOnBorder": true,
-            "mangoLayout": true,
-            "mangoLayoutGapsOverrideEnabled": true,
-            "mangoLayoutGapsOverride": true,
-            "mangoLayoutRadiusOverrideEnabled": true,
-            "mangoLayoutRadiusOverride": true,
-            "mangoLayoutBorderSizeEnabled": true,
-            "mangoLayoutBorderSize": true
-        })
-
-    function routeSearchTarget(target) {
-        if (!target)
-            return;
-        if (workspaceSections[target]) {
-            subTabIndex = 0;
-        } else if (layoutSections[target]) {
-            subTabIndex = 1;
-        } else if (target === "windowRules" || target.startsWith("windowRule")) {
-            subTabIndex = 2;
-        }
-    }
-
-    Component.onCompleted: routeSearchTarget(SettingsSearchService.targetSection)
-
-    Connections {
-        target: SettingsSearchService
-
-        function onTargetSectionChanged() {
-            root.routeSearchTarget(SettingsSearchService.targetSection);
-        }
-    }
-
-    ColumnLayout {
-        anchors.fill: parent
-        spacing: 0
-
-        Rectangle {
-            Layout.fillWidth: true
-            Layout.preferredHeight: 60
-            color: "transparent"
-
-            DankTabBar {
-                id: compositorTabBar
-
-                width: Math.min(500, parent.width - Theme.spacingL * 2)
-                height: 45
-                anchors.centerIn: parent
-                model: [
-                    {
-                        "text": I18n.tr("Workspaces"),
-                        "icon": "view_module"
-                    },
-                    {
-                        "text": I18n.tr("Window Layout"),
-                        "icon": "crop_square"
-                    },
-                    {
-                        "text": I18n.tr("Window Rules"),
-                        "icon": "select_window"
-                    }
-                ]
-                currentIndex: root.subTabIndex
-                onTabClicked: index => root.subTabIndex = index
-            }
-
-            Rectangle {
-                anchors.horizontalCenter: parent.horizontalCenter
-                y: compositorTabBar.y + compositorTabBar.height + 10
-                width: compositorTabBar.width
-                height: 1
-                color: Theme.surface
-                opacity: 0.56
-            }
-        }
-
-        Item {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            clip: true
-
-            Loader {
-                anchors.fill: parent
-                active: root.subTabIndex === 0
-                visible: active
-                sourceComponent: WorkspacesTab {}
-            }
-
-            Loader {
-                anchors.fill: parent
-                active: root.subTabIndex === 1
-                visible: active
-                sourceComponent: CompositorLayoutTab {}
-            }
-
-            Loader {
-                id: windowRulesLoader
-
-                property bool loadedOnce: false
-
-                anchors.fill: parent
-                active: root.subTabIndex === 2 || loadedOnce
-                visible: root.subTabIndex === 2 && status === Loader.Ready
-                asynchronous: true
-                sourceComponent: WindowRulesTab {
-                    pageActive: root.subTabIndex === 2
-                }
-
-                onLoaded: loadedOnce = true
-            }
-
-            StyledText {
-                anchors.centerIn: parent
-                visible: root.subTabIndex === 2 && windowRulesLoader.status === Loader.Loading
-                text: I18n.tr("Loading...", "loading indicator")
-                color: Theme.surfaceVariantText
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-}

quickshell/Modules/Settings/DankBarTab.qml

@@ -41,8 +41,8 @@ Item {
         SettingsData.barConfigs;
         const index = SettingsData.barConfigs.findIndex(config => config.id === selectedBarId);
         if (index < 0)
-            return I18n.tr("Bar");
-        return SettingsData.barConfigs[index].name || I18n.tr("Bar %1").arg(index + 1);
+            return I18n.tr("Bar", "fallback name for an unnamed bar");
+        return SettingsData.barConfigs[index].name || I18n.tr("Bar %1", "numbered name for an unnamed bar, %1 is its position").arg(index + 1);
     }
 
     property bool selectedBarIsVertical: {
@@ -796,18 +796,81 @@ Item {
                 }
             }
 
+            SettingsCard {
+                tab: "appearance"
+                iconName: "opacity"
+                title: I18n.tr("Opacity")
+                settingKey: "barTransparency"
+                visible: dankBarTab.appearanceOnly && selectedBarConfig?.enabled
+
+                SettingsSliderRow {
+                    id: barTransparencySlider
+                    visible: !SettingsData.frameEnabled
+                    text: I18n.tr("Bar Opacity")
+                    description: I18n.tr("Controls opacity of the bar background")
+                    value: (selectedBarConfig?.transparency ?? 1.0) * 100
+                    minimum: 0
+                    maximum: 100
+                    unit: "%"
+                    defaultValue: 100
+                    onSliderDragFinished: finalValue => {
+                        SettingsData.updateBarConfig(selectedBarId, {
+                            transparency: finalValue / 100
+                        });
+                    }
+
+                    Binding {
+                        target: barTransparencySlider
+                        property: "value"
+                        value: (selectedBarConfig?.transparency ?? 1.0) * 100
+                        restoreMode: Binding.RestoreBinding
+                    }
+                }
+
+                SettingsSliderRow {
+                    id: widgetTransparencySlider
+                    text: I18n.tr("Widget Opacity")
+                    description: I18n.tr("Controls opacity of widget backgrounds")
+                    value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
+                    minimum: 0
+                    maximum: 100
+                    unit: "%"
+                    defaultValue: 100
+                    onSliderDragFinished: finalValue => {
+                        SettingsData.updateBarConfig(selectedBarId, {
+                            widgetTransparency: finalValue / 100
+                        });
+                    }
+
+                    Binding {
+                        target: widgetTransparencySlider
+                        property: "value"
+                        value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
+                        restoreMode: Binding.RestoreBinding
+                    }
+                }
+
+                SettingsControlledByFrame {
+                    visible: SettingsData.frameEnabled
+                    parentModal: dankBarTab.parentModal
+                    settingLabel: I18n.tr("Bar Opacity")
+                    reason: I18n.tr("Managed by Frame")
+                }
+            }
+
             SettingsControlledByFrame {
-                visible: !dankBarTab.appearanceOnly && SettingsData.frameEnabled
+                visible: dankBarTab.appearanceOnly && SettingsData.frameEnabled
                 parentModal: dankBarTab.parentModal
                 settingLabel: I18n.tr("Bar spacing and size")
                 reason: I18n.tr("Managed by Frame")
             }
 
             SettingsCard {
+                tab: "appearance"
                 iconName: "space_bar"
                 title: I18n.tr("Spacing")
                 settingKey: "barSpacing"
-                visible: !dankBarTab.appearanceOnly && (selectedBarConfig?.enabled ?? false) && !SettingsData.frameEnabled
+                visible: dankBarTab.appearanceOnly && (selectedBarConfig?.enabled ?? false) && !SettingsData.frameEnabled
 
                 SettingsSliderRow {
                     id: edgeSpacingSlider
@@ -956,68 +1019,6 @@ Item {
                 }
             }
 
-            SettingsCard {
-                tab: "appearance"
-                iconName: "opacity"
-                title: I18n.tr("Transparency")
-                settingKey: "barTransparency"
-                visible: dankBarTab.appearanceOnly && selectedBarConfig?.enabled
-
-                SettingsSliderRow {
-                    id: barTransparencySlider
-                    visible: !SettingsData.frameEnabled
-                    text: I18n.tr("Bar Transparency")
-                    description: I18n.tr("Opacity of the bar background")
-                    value: (selectedBarConfig?.transparency ?? 1.0) * 100
-                    minimum: 0
-                    maximum: 100
-                    unit: "%"
-                    defaultValue: 100
-                    onSliderDragFinished: finalValue => {
-                        SettingsData.updateBarConfig(selectedBarId, {
-                            transparency: finalValue / 100
-                        });
-                    }
-
-                    Binding {
-                        target: barTransparencySlider
-                        property: "value"
-                        value: (selectedBarConfig?.transparency ?? 1.0) * 100
-                        restoreMode: Binding.RestoreBinding
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: widgetTransparencySlider
-                    text: I18n.tr("Widget Transparency")
-                    description: I18n.tr("Opacity of widget backgrounds")
-                    value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
-                    minimum: 0
-                    maximum: 100
-                    unit: "%"
-                    defaultValue: 100
-                    onSliderDragFinished: finalValue => {
-                        SettingsData.updateBarConfig(selectedBarId, {
-                            widgetTransparency: finalValue / 100
-                        });
-                    }
-
-                    Binding {
-                        target: widgetTransparencySlider
-                        property: "value"
-                        value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
-                        restoreMode: Binding.RestoreBinding
-                    }
-                }
-
-                SettingsControlledByFrame {
-                    visible: SettingsData.frameEnabled
-                    parentModal: dankBarTab.parentModal
-                    settingLabel: I18n.tr("Bar Transparency")
-                    reason: I18n.tr("Managed by Frame")
-                }
-            }
-
             SettingsSliderCard {
                 id: fontScaleSliderCard
                 tab: "appearance"
@@ -1358,7 +1359,7 @@ Item {
                 SettingsSliderRow {
                     id: borderOpacitySlider
                     text: I18n.tr("Opacity")
-                    description: I18n.tr("Transparency of the border")
+                    description: I18n.tr("Controls opacity of the border")
                     value: (selectedBarConfig?.borderOpacity ?? 1.0) * 100
                     minimum: 0
                     maximum: 100
@@ -1453,7 +1454,7 @@ Item {
                 SettingsSliderRow {
                     id: widgetOutlineOpacitySlider
                     text: I18n.tr("Opacity")
-                    description: I18n.tr("Transparency of the widget outline")
+                    description: I18n.tr("Controls opacity of the widget outline")
                     value: (selectedBarConfig?.widgetOutlineOpacity ?? 1.0) * 100
                     minimum: 0
                     maximum: 100
@@ -1562,7 +1563,7 @@ Item {
                 SettingsSliderRow {
                     visible: shadowCard.shadowActive
                     text: I18n.tr("Opacity")
-                    description: I18n.tr("Transparency of the shadow layer")
+                    description: I18n.tr("Controls opacity of the shadow layer")
                     minimum: 10
                     maximum: 100
                     unit: "%"
@@ -1754,6 +1755,9 @@ Item {
                     text: I18n.tr("Y Axis")
                     description: I18n.tr("Action performed when scrolling vertically on the bar")
                     model: CompositorService.isNiri ? [I18n.tr("None"), I18n.tr("Workspace"), I18n.tr("Column")] : [I18n.tr("None"), I18n.tr("Workspace")]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                     currentIndex: {
                         switch (selectedBarConfig?.scrollYBehavior || "workspace") {
                         case "none":
@@ -1792,6 +1796,9 @@ Item {
                     description: I18n.tr("Action performed when scrolling horizontally on the bar")
                     visible: CompositorService.isNiri
                     model: [I18n.tr("None"), I18n.tr("Workspace"), I18n.tr("Column")]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                     currentIndex: {
                         switch (selectedBarConfig?.scrollXBehavior || "column") {
                         case "none":

quickshell/Modules/Settings/DisplayConfig/DisplayConfigState.qml

@@ -1023,7 +1023,6 @@ Singleton {
             return parseNiriOutputs(content);
         case "hyprland":
             return parseHyprlandOutputs(content);
-        case "dwl":
         case "mango":
             return parseMangoOutputs(content);
         default:
@@ -1362,7 +1361,6 @@ Singleton {
                 "grepPattern": "dms.outputs",
                 "includeLine": "require(\"dms.outputs\")"
             };
-        case "dwl":
         case "mango":
             return {
                 "configFile": configDir + "/mango/config.conf",
@@ -1377,7 +1375,7 @@ Singleton {
 
     function checkIncludeStatus() {
         const compositor = CompositorService.compositor;
-        if (compositor !== "niri" && compositor !== "hyprland" && compositor !== "dwl" && compositor !== "mango") {
+        if (compositor !== "niri" && compositor !== "hyprland" && compositor !== "mango") {
             includeStatus = {
                 "exists": false,
                 "included": false,
@@ -1388,8 +1386,7 @@ Singleton {
         }
 
         const filename = (compositor === "niri") ? "outputs.kdl" : ((compositor === "hyprland") ? "outputs.lua" : "outputs.conf");
-        // mango and dwl both use outputs.conf under ~/.config/mango
-        const compositorArg = (compositor === "dwl" || compositor === "mango") ? "mangowc" : compositor;
+        const compositorArg = (compositor === "mango") ? "mangowc" : compositor;
 
         checkingInclude = true;
         Proc.runCommand("check-outputs-include", ["dms", "config", "resolve-include", compositorArg, filename], (output, exitCode) => {
@@ -1589,9 +1586,6 @@ Singleton {
         case "mango":
             MangoService.generateOutputsConfig(outputsData, finish);
             break;
-        case "dwl":
-            DwlService.generateOutputsConfig(outputsData, finish);
-            break;
         default:
             WlrOutputService.applyOutputsConfig(outputsData, outputs);
             finish(true);

quickshell/Modules/Settings/DisplayConfig/OutputCard.qml

@@ -317,7 +317,7 @@ StyledRect {
         DankToggle {
             width: parent.width
             text: I18n.tr("Variable Refresh Rate")
-            visible: root.isConnected && !root.isDisabled && !CompositorService.isDwl && !CompositorService.isMango && !CompositorService.isHyprland && !CompositorService.isNiri && (DisplayConfigState.outputs[root.outputName]?.vrr_supported ?? false)
+            visible: root.isConnected && !root.isDisabled && !CompositorService.isMango && !CompositorService.isHyprland && !CompositorService.isNiri && (DisplayConfigState.outputs[root.outputName]?.vrr_supported ?? false)
             checked: {
                 const pendingVrr = DisplayConfigState.getPendingValue(root.outputName, "vrr");
                 if (pendingVrr !== undefined)

quickshell/Modules/Settings/DisplayConfigTab.qml

@@ -500,7 +500,7 @@ Item {
 
                         Column {
                             id: displayFormatColumn
-                            visible: !CompositorService.isDwl && !CompositorService.isMango
+                            visible: !CompositorService.isMango
                             spacing: Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
 

quickshell/Modules/Settings/DockTab.qml

@@ -282,8 +282,6 @@ Item {
                                         modes.push("niri");
                                     } else if (CompositorService.isHyprland) {
                                         modes.push("Hyprland");
-                                    } else if (CompositorService.isDwl) {
-                                        modes.push("mango");
                                     } else if (CompositorService.isMango) {
                                         modes.push("mango");
                                     } else if (CompositorService.isSway) {
@@ -645,19 +643,19 @@ Item {
             SettingsControlledByFrame {
                 visible: root.connectedFrameModeActive
                 parentModal: root.parentModal
-                settingLabel: I18n.tr("Dock margin, transparency, and border")
+                settingLabel: I18n.tr("Dock margin, opacity, and border")
                 reason: I18n.tr("Managed by Frame in Connected Mode")
             }
 
             SettingsCard {
                 width: parent.width
                 iconName: "opacity"
-                title: I18n.tr("Transparency")
+                title: I18n.tr("Opacity")
                 settingKey: "dockTransparency"
                 visible: !root.connectedFrameModeActive
 
                 SettingsSliderRow {
-                    text: I18n.tr("Dock Transparency")
+                    text: I18n.tr("Dock Opacity")
                     value: Math.round(SettingsData.dockTransparency * 100)
                     minimum: 0
                     maximum: 100

quickshell/Modules/Settings/FrameTab.qml

@@ -205,6 +205,9 @@ Item {
                     tags: ["frame", "border", "color", "theme", "primary", "surface", "default"]
                     text: I18n.tr("Border Color")
                     model: [I18n.tr("Default"), I18n.tr("Primary"), I18n.tr("Surface"), I18n.tr("Custom")]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                     currentIndex: {
                         const fc = SettingsData.frameColor;
                         if (!fc || fc === "default")

quickshell/Modules/Settings/GreeterTab.qml

@@ -151,7 +151,7 @@ Item {
 
     function runGreeterInstallAction() {
         root.greeterPendingAction = !root.greeterInstalled ? "install" : !root.greeterEnabled ? "activate" : "uninstall";
-        greeterStatusText = I18n.tr("Opening terminal: ") + root.greeterActionLabel + "…";
+        greeterStatusText = I18n.tr("Opening terminal: ") + root.greeterActionLabel + "...";
         greeterInstallActionRunning = true;
         greeterInstallActionProcess.running = true;
     }
@@ -188,7 +188,7 @@ Item {
         greeterSudoProbeStderr = "";
         greeterTerminalFallbackStderr = "";
         greeterTerminalFallbackFromPrecheck = false;
-        greeterStatusText = I18n.tr("Checking whether sudo authentication is needed…");
+        greeterStatusText = I18n.tr("Checking whether sudo authentication is needed...");
         greeterSyncRunning = true;
         greeterSudoProbeProcess.running = true;
     }
@@ -327,7 +327,7 @@ Item {
         onExited: exitCode => {
             const err = (root.greeterSudoProbeStderr || "").trim();
             if (exitCode === 0) {
-                root.greeterStatusText = I18n.tr("Running greeter sync…");
+                root.greeterStatusText = I18n.tr("Running greeter sync...");
                 greeterSyncProcess.running = true;
                 return;
             }
@@ -468,7 +468,7 @@ Item {
                         id: statusTextArea
                         anchors.fill: parent
                         anchors.margins: Theme.spacingM
-                        text: root.greeterStatusRunning ? I18n.tr("Checking…", "greeter status loading") : (root.greeterStatusText || I18n.tr("Click Refresh to check status.", "greeter status placeholder"))
+                        text: root.greeterStatusRunning ? I18n.tr("Checking...", "greeter status loading") : (root.greeterStatusText || I18n.tr("Click Refresh to check status.", "greeter status placeholder"))
                         font.pixelSize: Theme.fontSizeSmall
                         font.family: "monospace"
                         color: root.greeterStatusRunning ? Theme.surfaceVariantText : Theme.surfaceText

quickshell/Modules/Settings/LauncherTab.qml

@@ -304,8 +304,6 @@ Item {
                                 modes.push("niri");
                             } else if (CompositorService.isHyprland) {
                                 modes.push("Hyprland");
-                            } else if (CompositorService.isDwl) {
-                                modes.push("mango");
                             } else if (CompositorService.isMango) {
                                 modes.push("mango");
                             } else if (CompositorService.isSway) {