remove OS static this. input for windows only

vladdeSV · Feb 18, 2017 · c633478 · c633478
1 parent 39cde80
commit c633478
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 22 deletions.
diff --git a/source/scone/core.d b/source/scone/core.d
@@ -13,12 +13,18 @@ static this()
     logfile.writefln("scone: %s", Clock.currTime().toISOExtString());
 
     //get current width and height
+    OS.init();
     auto w = OS.size[0];
     auto h = OS.size[1];
 
     //init window
     window = Window(w,h);
 }
 
+static ~this()
+{
+    OS.deinit();
+}
+
 ///global window (aka console/terminal)
 static Window window;
diff --git a/source/scone/os.d b/source/scone/os.d
@@ -29,10 +29,10 @@ version(Posix)
 }
 
 struct OS
-{
+{    
     static:
-    
-    static this()
+
+    auto init()
     {
         cursorVisible = false;
 
@@ -47,7 +47,7 @@ struct OS
         }
     }
 
-    static ~this()
+    auto deinit()
     {
         cursorVisible = true;
         setCursor(0,0);
@@ -1112,6 +1112,7 @@ struct OS
             }
         }
 
+        /+
         void pollInputEvent(Tid parentThreadID)
         {
             import std.datetime;
@@ -1126,5 +1127,6 @@ struct OS
                 }
             }
         }
+        +/
     }
 }
diff --git a/source/scone/window.d b/source/scone/window.d
@@ -278,30 +278,34 @@ struct Window
     alias w = width;
     alias h = height;
 
-    /**
-     * Returns: InputEvent, last call
-     */
-    InputEvent[] getInputs()
+    //Temporarily disable input for non-Windows
+    version(Windows)
     {
-        version(Windows){ return OS.Windows.retreiveInputs(); }
-        version(Posix)
+        /**
+        * Returns: InputEvent, last call
+        */
+        InputEvent[] getInputs()
         {
-            /+
-            import std.datetime : msecs;
+            version(Windows){ return OS.Windows.retreiveInputs(); }
+            version(Posix)
+            {
+                /+
+                import std.datetime : msecs;
 
-            InputEvent e;
+                InputEvent e;
 
-            receiveTimeout(
-                100.msecs,
-                (InputEvent ie) { e = ie; }
-            );
+                receiveTimeout(
+                    100.msecs,
+                    (InputEvent ie) { e = ie; }
+                );
 
-            if(e.key != SK.unknown)
-            {
-                return [e];
+                if(e.key != SK.unknown)
+                {
+                    return [e];
+                }
+                +/
+                return null;
             }
-            +/
-            return null;
         }
     }