add support for focus-mode

Author: user

docs/wormc.md

@@ -103,3 +103,7 @@ Sets the path for the appropriate button for inactive windows only, when being h
 Takes a modifier (defined in, eg, X11/X.h) and sets it as the default for moving/resizing windows. Examples:
   1 << 3 = Mod1Mask = Alt           = 8
   1 << 6 = Mod4Mask = Super/Mod/Win = 64
+### `focus-mode(int)`
+Sets the focus mode.
+  1: is focus-follows-click (like Microsoft Windows).
+  2: is the traditional X11 focus-follows-mouse.

src/atoms.nim

@@ -91,6 +91,7 @@ type
     IpcMaximizeClient       = "WORM_IPC_MAXIMIZE_CLIENT",
     IpcMinimizeClient       = "WORM_IPC_MINIMIZE_CLIENT",
     IpcDecorationDisable  = "WORM_IPC_DECORATION_DISABLE",
+    IpcFocusMode = "WORM_IPC_FOCUS_MODE",
     IpcModifier = "WORM_IPC_MODIFIER"
 
 func getNetAtoms*(dpy: ptr Display): array[NetAtom, Atom] =

src/events/clientmessage.nim

@@ -693,4 +693,8 @@ proc handleClientMessage*(self: var Wm; ev: XClientMessageEvent) =
             None,
             None
           )
-     
+    elif ev.data.l[0] == clong self.ipcAtoms[IpcFocusMode]:
+      if ev.data.l[1] == 1:
+        self.focusMode = FocusFollowsClick
+      else:
+        self.focusMode = FocusFollowsMouse

src/events/enternotify.nim

@@ -1,6 +1,6 @@
 import ../wm, ../types
-import x11/xlib
-# import std/options
+import x11/xlib, x11/x
+import std/options
 
 proc handleEnterNotify*(self: var Wm; ev: XEnterWindowEvent): void =
   for client in self.clients.mitems:
@@ -16,4 +16,13 @@ proc handleEnterNotify*(self: var Wm; ev: XEnterWindowEvent): void =
       client.frame.minimizeHovered = true
       self.renderTop client
       break
-    
+    if self.focusMode == FocusFollowsMouse:
+      let clientOpt = self.findClient do (client: Client) ->
+          bool: client.frame.window == ev.window or client.frame.window == ev.subwindow
+      if clientOpt.isNone: return
+      let client = clientOpt.get[0]
+      discard self.dpy.XRaiseWindow client.frame.window
+      discard self.dpy.XSetInputFocus(client.window, RevertToPointerRoot, CurrentTime)
+      discard self.dpy.XMapWindow client.frame.window
+      self.focused = some clientOpt.get[1]
+      self.raiseClient clientOpt.get[0][]

src/types.nim

@@ -49,6 +49,8 @@ type
     closePaths*, minimizePaths*, maximizePaths*: ButtonPaths
     modifier*: uint32
   TagSet* = array[9, bool] # distinct
+  FocusMode* = enum
+    FocusFollowsClick, FocusFollowsMouse
 
 proc defaultTagSet*: TagSet = [true, false, false, false, false, false, false,
     false, false] # put the user on tag 1 when the wm starts.

src/wm.nim

@@ -25,6 +25,7 @@ type
     tags*: TagSet
     layout*: Layout
     noDecorList*: seq[Regex]
+    focusMode*: FocusMode
 
 proc initWm*(): Wm =
   let dpy = XOpenDisplay nil
@@ -165,6 +166,7 @@ proc initWm*(): Wm =
     tags: defaultTagSet(),
     layout: lyFloating,
     noDecorList: @[],
+    focusMode: FocusFollowsClick
   )
 
 func findClient*(

src/wormc.nim

@@ -185,7 +185,8 @@ proc main() =
       data = ipcAtoms[IpcMinimizeClient].formatMess()
     of "modifier":
       data = ipcAtoms[IpcModifier].formatMess(params[i+1])
-
+    of "focus-mode":
+      data = ipcAtoms[IpcFocusMode].formatMess(params[i+1])
 
     else: discard