Fix user style regression, add minimum-contrast

1 files changed, 14 insertions, 12 deletions

diff --git a/src/display/client.nim b/src/display/client.nim
index f4acaee4..05a5a0fc 100644
--- a/src/display/client.nim
+++ b/src/display/client.nim
@@ -246,16 +246,6 @@ proc inputLoop(client: Client) =
         if event.fd == client.console.tty.getFileHandle():
           client.input()
           stdout.flushFile()
-        elif event.fd in client.interval_fdis:
-          client.intervals[client.interval_fdis[event.fd]].handler()
-        elif event.fd in client.timeout_fdis:
-          let id = client.timeout_fdis[event.fd]
-          let timeout = client.timeouts[id]
-          timeout.handler()
-          client.clearTimeout(id)
-        elif event.fd == sigwinch:
-          client.attrs = getWindowAttributes(client.console.tty)
-          client.pager.windowChange(client.attrs)
         else:
           let container = client.fdmap[event.fd]
           if not client.pager.handleEvent(container):
@@ -263,10 +253,22 @@ proc inputLoop(client: Client) =
             for msg in client.pager.status:
               eprint msg
             client.quit(1)
-      elif Error in event.events:
+      if Error in event.events:
         eprint "Error", event
         #TODO handle errors
-      else: assert false
+      if Signal in event.events: 
+        if event.fd == sigwinch:
+          client.attrs = getWindowAttributes(client.console.tty)
+          client.pager.windowChange(client.attrs)
+        else: assert false
+      if Event.Timer in event.events:
+        if event.fd in client.interval_fdis:
+          client.intervals[client.interval_fdis[event.fd]].handler()
+        if event.fd in client.timeout_fdis:
+          let id = client.timeout_fdis[event.fd]
+          let timeout = client.timeouts[id]
+          timeout.handler()
+          client.clearTimeout(id)
     if client.pager.scommand != "":
       client.command(client.pager.scommand)
       client.pager.scommand = ""