minor tweaks

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

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/examples/example_3.d b/examples/example_3.d
@@ -1,21 +1,21 @@
-/*
 import scone;
 
 void main()
 {
     bool loop = true;
 
-    while (loop)
-    {
-        foreach(input; getInputs())
+    while(loop)
+    {        
+        foreach(input; window.getInputs())
         {
-            if(input.key == SK.escape || input.key == SK.c && input.hasControlKey(SCK.ctrl))
+            if((input.key == SK.c && input.hasControlKey(SCK.ctrl)) || input.key == SK.escape)
             {
                 loop = false;
                 break;
             }
 
             window.clear();
+
             window.write
             (
                 0,0,
@@ -27,5 +27,4 @@ void main()
 
         window.print();
     }
-}
-*/
+}
diff --git a/source/scone/os.d b/source/scone/os.d
@@ -280,7 +280,7 @@ struct OS
 
         private HANDLE _hConsoleOutput, _hConsoleInput;
         private DWORD _inputsRead, _mode = ENABLE_WINDOW_INPUT | ENABLE_WINDOW_INPUT, _oldMode;
-        private INPUT_RECORD _inputBuffer;
+        private INPUT_RECORD[128] _inputBuffer;
         private CONSOLE_SCREEN_BUFFER_INFO _consoleScreenBufferInfo;
 
         ushort attributesFromCell(Cell cell)
@@ -410,20 +410,23 @@ struct OS
 
             InputEvent[] _inputEvents;
 
-            ReadConsoleInputA(_hConsoleInput, &_inputBuffer, 1, &_inputsRead);
-            switch(_inputBuffer.EventType)
+            ReadConsoleInputA(_hConsoleInput, _inputBuffer.ptr, 128, &_inputsRead);
+            for(size_t e = 0; e < read; ++e)
             {
-            case KEY_EVENT:
-                _inputEvents ~= InputEvent
-                (
-                    getKeyFromKeyEventRecord(_inputBuffer.KeyEvent),
-                    getControlKeyFromKeyEventRecord(_inputBuffer.KeyEvent),
-                    cast(bool) _inputBuffer.KeyEvent.bKeyDown
-                );
-                break;
+                switch(_inputBuffer[e].EventType)
+                {
+                case KEY_EVENT:
+                    _inputEvents ~= InputEvent
+                    (
+                        getKeyFromKeyEventRecord(_inputBuffer[e].KeyEvent),
+                        getControlKeyFromKeyEventRecord(_inputBuffer[e].KeyEvent),
+                        cast(bool) _inputBuffer[e].KeyEvent.bKeyDown
+                    );
+                    break;
 
-            default:
-                break;
+                default:
+                    break;
+                }
             }
 
             return _inputEvents;