From 6c7c87ce55b18fc82cc815414cfed6241267c613 Mon Sep 17 00:00:00 2001
From: Wesley Kerfoot <wjak56@gmail.com>
Date: Thu, 6 Aug 2020 21:48:25 -0400
Subject: [PATCH] templatize spawning processes

---
 src/nimwin.nim | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/nimwin.nim b/src/nimwin.nim
index c7fb508..37fbc05 100644
--- a/src/nimwin.nim
+++ b/src/nimwin.nim
@@ -20,9 +20,15 @@ proc cstringToNim(cst : cstring) : Option[string] =
   none(string)
 
 template HandleKey(key : TKeySym, body : untyped) : untyped =
-    block:
-      if (XLookupKeySym(cast[PXKeyEvent](ev.xkey.addr), 0) == key.cuint):
-        body
+  block:
+    if (XLookupKeySym(cast[PXKeyEvent](ev.xkey.addr), 0) == key.cuint):
+      body
+
+template RunProcess(procedure : untyped) : untyped =
+  block:
+    let p = procedure()
+    openProcesses[p.processID] = p
+    spawn handleProcess(p)
 
 type
   WinPropKind = enum pkString, pkCardinal, pkAtom
@@ -412,10 +418,14 @@ when isMainModule:
     # For spawning, e.g. a terminal we also want events for the root window
 
     if ev.theType == KeyPress:
+
+      # ctrl+mod+shift runs terminal
       HandleKey(XK_Return):
-        let p = startTerminal()
-        openProcesses[p.processID] = p
-        spawn handleProcess(p)
+        RunProcess(startTerminal)
+
+      HandleKey(XK_P):
+        # mod+p runs the launcher
+        RunProcess(launcher)
 
       HandleKey(XK_C):
         let windowStack = toSeq(getChildren(display))
@@ -434,11 +444,6 @@ when isMainModule:
             discard display.XSetInputFocus(windowStack[0].win, RevertToPointerRoot, CurrentTime)
             discard display.XRaiseWindow(windowStack[0].win)
 
-      HandleKey(XK_P):
-        let p = launcher()
-        openProcesses[p.processID] = p
-        spawn handleProcess(p)
-
       HandleKey(XK_Q):
         let currentPath = getAppDir()