Changeset 201

Timestamp:

07/26/10 00:52:41 (2 years ago)

Author:

JoeCoder

Message:

Improved cursor positioning for home/end/up/down
Fixed bugs and improved event system interface for mouse events and buttons/scroll wheel.
Fixed Surface.getPolygon not matching its rendered position.
Cursor positioning on mouse click.
Added Surface.localToGlobal, localToParent, parentToLocal, and globalToLocal (although they're not quite finished).
Added Input.mouse to get the current mouse state.
Added Vec toInt and toFloat.

Files:

• trunk/src/demo1/main.d (modified) (4 diffs)
• trunk/src/demo2/main.d (modified) (6 diffs)
• trunk/src/yage/core/math/vector.d (modified) (2 diffs)
• trunk/src/yage/gui/surface.d (modified) (17 diffs)
• trunk/src/yage/gui/textblock.d (modified) (20 diffs)
• trunk/src/yage/system/graphics/render.d (modified) (1 diff)
• trunk/src/yage/system/input.d (modified) (7 diffs)

trunk/src/demo1/main.d

@@ -167 +167 @@
-    };
-    
-byte buttons
+Input.MouseButton button
-        scene.ship.acceptInput = !scene.ship.acceptInput;
-        self.grabMouse(scene.ship.acceptInput);
-        return false;
-    };
-byte buttons, 
+
-        if(scene.ship.acceptInput)
-            scene.ship.input.mouseDelta += rel;
@@ -180 +180 @@
-    // Make a draggable window to show some useful info.
-    auto info = view.addChild(new Surface());
-0px; height: 100px; color: white; padding: -6px
+5px; height: 100px; color: white
-        "border-width: 12px; border-image: url('gui/skin/panel1.png'); font-size: 12px");
-
-    //window.style.backgroundImage = scene.camera.getTexture();
-
-
-
+
+
+
+
-        return false; // don't propagate upward
-    };
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        self.style.set("border-image: url('gui/skin/panel2.png')");
-        return false;
-    };
-, byte buttons, Vec2i coordinates
+
-        self.style.set("border-image: url('gui/skin/panel1.png')");
-        return false;
@@ -229 +231 @@
-        {   float framerate = fps/frame.tell();
-            window.setCaption(format("Yage Demo | %.2f fps\0", framerate));
-innerHtml = 
+setHtml(
-                `%.2f <b>fps</span><br/>`
-                `%d <b>objects</b><br/>`
@@ -235 +237 @@
-                `%d <b>vertices</b><br/>`
-                `%d <b>lights</b><br/><br/> wasd to move<br/> +q for hyperdrive<br/>space to shoot`,
-
+)
-            frame.seek(0);
-            fps = 0;

trunk/src/demo2/main.d

@@ -18 +18 @@
-import derelict.opengl.gl;
-import derelict.opengl.glext;
+
+bool dragging;
-
-// program entry point.
@@ -53 +55 @@
-        return true;
-    };
-    view.onMouseDown = delegate bool(Surface self, byte buttons, Vec2i coordinates) {
-        self.grabMouse(!self.getGrabbedMouse());
-        return true;
-    };
-    
-    // Lights
@@ -62 +60 @@
-    l1.setPosition(Vec3f(0, 200, -30)); 
-
-For Testing
+A window with text in it
-    auto info = view.addChild(new Surface());
-    info.style.set("top: 40px; left: 40px; width: 500px; height: 260px; padding: 3px; color: #ff8800; " ~
@@ -70 +68 @@
-    info.style.overflowY = Style.Overflow.HIDDEN;
-    
-
-
-
+
+
+
+
-        return false;
-    };
-byte buttons, Vec2i amount) {
-(buttons == 1) 
-cast(Vec2f)amount
+Vec2i amount) {     
+ (dragging)
+amount.toFloat()
-        return false;
-    };
-
-
+
+
+
-        return false;
-    };
-, byte buttons, Vec2i coordinates
-//
+
+
-        return false;
-    };
-, byte buttons, Vec2i coordinates
-//
+
+
-        return false;
-    };
-    info.editable = view.editable = true;
-/info.style.transform = Matrix().scale(Vec3f(.5, .5, .5));
-
+*
+// Test overflow clipping
-    auto clip = info.addChild(new Surface());
-    clip.style.set("width: 60px; height: 60px; background-color: black; top: -30px; left: -30px; overflow: hidden");
@@ -103 +103 @@
-    auto clip3 = info.addChild(new Surface());
-    clip3.style.set("width: 60px; height: 60px; background-color: orange; top: -30px; right: -30px");
-
+*/
-    
-    
@@ -115 +115 @@
-        auto stats = Render.scene(camera, window);
-        Render.surface(view, window);
-
-        Render.complete(); // swap buffers
-        
-Print framerate
-ps++
+Rotate the info box
+loat amount = total.tell()
-        info.style.transform = Matrix();
-        info.style.transform = info.style.transform.move(Vec3f(-300, -20, 0));
-sin(total.tell()/2)/2, sin(total.tell()
+/*sin(amount/2)/2*/0, sin(amount
-        info.style.transform = info.style.transform.move(Vec3f(300, 20, 0));
-        
-        
+        fps++;
-        if (frame.tell()>=.25f && !(Surface.getFocusSurface() is info))
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            
-            frame.seek(0);

trunk/src/yage/core/math/vector.d

@@ -159 +159 @@
-        assert(Vec2f(0, 0).inside(polygon));
-        assert(!Vec2f(0, 2).inside(polygon));
+        assert(Vec2f(0, .999999).inside(polygon));
+        assert(!Vec2f(0, 1.00001).inside(polygon));
-    }
-    
@@ -290 +292 @@
-    
-    /// Allow casting to float where appropriate
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    /// Get the element at i

trunk/src/yage/gui/surface.d

@@ -7 +7 @@
-module yage.gui.surface;
-
+public import derelict.sdl.sdl;
+
-import tango.math.IEEE;
-import tango.math.Math;
-import tango.text.convert.Utf;
-import yage.core.all;
-import yage.system.system;
-import yage.system.input;
-import yage.system.log;
-import yage.system.graphics.render;
-import yage.system.window;
-import yage.resource.manager;
@@ -20 +19 @@
-import yage.resource.image;
-import yage.resource.material;
+import yage.system.input;
-import yage.gui.style;
-import yage.gui.textblock;
@@ -33 +33 @@
-{   
-    Style style;
-
-
+
-    bool editable = false; /// The text of this surface is editable.
-    bool mouseChildren = true; /// Allow the mouse to interact with this Surface's children.
+    int mouseX, mouseY; /// Current position of the mouse cursor.  (Read-only for now)
-    TextCursor textCursor; ///
-    
@@ -42 +42 @@
-    bool delegate(Surface self) onBlur; ///
-    bool delegate(Surface self) onFocus; ///
-byte buttons
-byte buttons, Vec2i coordinates) onDblCick; ///
+Input.MouseButton button
+Input.MouseButton button, Vec2i coordinates) onDblCick; /// TODO
-    bool delegate(Surface self, int key, int modifier) onKeyDown; /// Triggered once when a key is pressed down
-    bool delegate(Surface self, int key, int modifier) onKeyUp; /// Triggered once when a key is released
@@ -51 +51 @@
-     * Unlike onKeyDown and onKeyUp, key is the unicode value of the key press, instead of the sdl key code. */
-    bool delegate(Surface self, dchar key, int modifier) onKeyPress; 
-byte buttons
-byte buttons
-byte buttons, 
-, byte buttons, Vec2i coordinates
-, byte buttons, Vec2i coordinates
+Input.MouseButton button
+Input.MouseButton button
+
+
+
-    void delegate(Surface self, Vec2f amount) onResize; ///
-    
-    /// This is a mirror of SDLMod (SDL's modifier key struct)
-    enum ModifierKey
-    {   NONE  = 0x0000, /// Allowed values.
-        LSHIFT= 0x0001, /// ditto
-        RSHIFT= 0x0002, /// ditto
-        LCTRL = 0x0040, /// ditto
-        RCTRL = 0x0080, /// ditto
-        LALT  = 0x0100, /// ditto
-        RALT  = 0x0200, /// ditto
-        LMETA = 0x0400, /// ditto
-        RMETA = 0x0800, /// ditto
-        NUM   = 0x1000, /// ditto
-        CAPS  = 0x2000, /// ditto
-        MODE  = 0x4000, /// ditto
-        RESERVED = 0x8000, /// ditto
-        CTRL  = LCTRL | RCTRL, /// ditto
-        SHIFT = LSHIFT | RSHIFT, /// ditto
-        ALT   = LALT | RALT, /// ditto
-        META  = LMETA | RMETA /// ditto
-    };  
-
-    protected Texture textTexture;  // texture that constains rendered text image.
-    
@@ -88 +67 @@
-    protected bool mouseIn;         // used to track mouseover/mouseout
-    protected bool mouseMoved;      // used for click() event.
+    
-    protected bool resizeDirty = true;
-    protected bool textDirty = true;
@@ -155 +135 @@
-    }
-
+    
+    
+    
-    /**
-     * Find the surface at the given coordinates.
@@ -166 +149 @@
-     *         the children will not be searched.
-     * Returns: The surface at the coordinates (may be self), or null if coordinates are outside of this surface. */
-float x, float 
+Vec2i x
-    {   
-        // Search children
-        if (useMouseChildren && mouseChildren)
-        {   // Sort if necessary
-            if (!children.sorted(false, (Surface s){return s.style.zIndex;}))
-                children.radixSort(false, (Surface s){return s.style.zIndex;});
-            
-            foreach(surf; children)
-            {   Surface result = surf.findSurface(x, y);
-                if (result)
-                    return result;
-            }
-        }
-        
-        // Search self
-        Vec2f[4] polygon;
-        getPolygon(polygon);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return this;
+        }
-        
-        return null;        
@@ -238 +222 @@
-    SurfaceGeometry getGeometry()
-    {   return geometry;        
+    }
+    
+    /**
+     * Get a 4-sided polygon of the outline of this surface, after all styles and the transformation are applied.
+     * Coordinates are relative to the parent Surface.
+     * Params:
+     *     polygon = A pointer to a Vec2f[4] where the result will be stored and returned.  
+     *         If null, new memory will be allocated. */
+    public Vec2f[] getPolygon(in Vec2f[] polygon=null)
+    {   if (polygon.length < 4)
+            polygon = new Vec2f[4];
+        polygon[0] = localToParent(Vec2f(0));           // top left
+        polygon[1] = localToParent(Vec2f(size.x, 0));   // top right
+        polygon[2] = localToParent(size);               // bottom right
+        polygon[3] = localToParent(Vec2f(0, size.y));   // bottom left
+        return polygon;
-    }
-    
@@ -255 +255 @@
-        {   SDL_WM_GrabInput(SDL_GRAB_OFF);         
-            grabbedSurface = null;
+            SDL_WarpMouse(mouseX+cast(int)offsetAbsolute.x, mouseY+cast(int)offsetAbsolute.y);
-        }       
-    }
@@ -261 +262 @@
-    }
-    
-
-
+
+
+
-    {   return textBlock.getHtml();
-    }
-    /// ditto
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -360 +396 @@
-     * Update all of this Surface's dimensions, geometry, and children to prepare it for rendering. */
-    void update()
-
+  
-        Style cs = getComputedStyle();
-        updateDimensions(cs);
@@ -380 +416 @@
-            int height = cast(int)height();
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            
-            textDirty = false;
@@ -438 +473 @@
-    }
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
-        if(onClick)
-
-
-
+
+
+
+
+
+
+
+
-        if(parent && propagate) 
-
-
-
-
+
+
+
-    /**
-     * Trigger a keyDown event and call the onKeyDown callback function if set. 
-
+or if it returns true (propagate), 
-     * Params:
-     *     key = SDL's key code of the pressed key.
-     *     mod = Modifier key held down while key was pressed.*/ 
-
+Input.
-    {   bool propagate = true;
-        if(onKeyDown)
@@ -466 +512 @@
-    /**
-     * Trigger a keyUp event and call the onKeyUp callback function if set. 
-
+or if it returns true (propagate), 
-     * Params:
-     *     key = SDL's key code of the pressed key.
-     *     mod = Modifier key held down while key was pressed.*/ 
-
+Input.
-    {   bool propagate = true;
-        if(onKeyUp)
@@ -479 +525 @@
-    
-    /**
-
-
+
+
+
+
-     * Params:
-     *     key = SDL's key code of the pressed key.
-     *     mod = Modifier key held down while key was pressed.
-     *     unicode = unicode value of pressed key. */ 
-
-
+
-        bool propagate = true;
-        if(onKeyPress)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
-    /**
-     * Trigger a mouseDown event and call the onMouseDown callback function if set. 
-
-
+
+
+
+
+
-        mouseMoved = false;
-        bool propagate = true;
-        if(onMouseDown)
-s
+
-        if(parent && propagate) 
-s
+
-    }
-    
-    /**
-     * Trigger a mouseUp event and call the onMouseUp callback function if set. 
-
-
+
+
+
+
+
-        bool propagate = true;
-        if(onMouseUp)
-s
+
-        if (!mouseMoved) // trigger the click event if the mouse button went down and up without the mouse moving.
-s
+
-        if(parent && propagate) 
-
-
-
-
-
-
+
+
+
+
+
+
+
-        mouseMoved = true;
-        bool propagate = true;
-        if(onMouseMove)
-buttons, 
+
-        if(parent && propagate) 
-
-
-
-
-
-
+
+
+
+
+
+
+
-        if(!mouseIn)
-
-
+
-            mouseIn = true;
-            if(onMouseOver) 
-, buttons, coordinates
+
-            if(parent && propagate) 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    {
-        if(mouseIn)
-bool propagate = true;
+
-            if(isChild(next))
-
-else
-{  
-   if(onMouseOut)
-       propagate = onMouseOut(this, buttons, coordinates);         
-if(next !is parent && parent && propagate)
-       parent.mouseOut(next, buttons, coordinates);
-}
+ // Don't do anything if mouseOut occurs when going into a child.
+
+
+bool propagate = true;
+if(onMouseOut)
+propagate = onMouseOut(this);          
+if(next !is parent && parent && propagate)
+   parent.mouseOut(next);
-        }
-    }
@@ -608 +660 @@
-    }
-
-    
-    /*
-     * Get a 4-sided polygon of the outline of this surface, after all styles and the transformation are applied.
-     * Coordinates are relative to the parent Surface.
-     * Params:
-     *     polygon = A pointer to a Vec2f[4] where the result will be stored. */
-    protected Vec2f[] getPolygon(in Vec2f[] polygon=null)
-    {   if (polygon.length < 4)
-            polygon = new Vec2f[4];
-        polygon[0] = Vec3f(0).transform(style.transform).vec2f + offset;            // top left
-        polygon[1] = Vec3f(size.x, 0, 0).transform(style.transform).vec2f + offset; // top right
-        polygon[2] = size.vec3f.transform(style.transform).vec2f + offset;          // bottom right
-        polygon[3] = Vec3f(0, size.y, 0).transform(style.transform).vec2f + offset; // bottom left
-        return polygon;
-    }
-    
-    
-    // Set style dimensions from pixels.
-    protected void top(float v)    

trunk/src/yage/gui/textblock.d

@@ -45 +45 @@
-/**
- * Render text and simple html with styles to an image.
-
+
+
-struct TextBlock
-{
@@ -54 +55 @@
-    
-    private char[] html;
+    private bool htmlDirty = true;      // html has changed, letters may be out of date
+    private bool lettersDirty = false;  // letters have chagned via input, html may be out of date
-    package InlineStyle style; // base style of entire text block
-    private Style.TextAlign alignment;
@@ -91 +94 @@
-         * Get the cursor position from an xy pixel position. */
-        int xyToCursor(Vec2i xy)
-
+
+
+
-            // Calculate line
-
-
-
+
+
+
+
+
+
+
-            
-            // Take alignment into account
@@ -105 +114 @@
-            for (; position<lines[line].letters.length && 0 < xy.x; position++)
-                xy.x -= lines[line].letters[position].advanceX;
+            
+            /*
+            int position, x;
+            while(true)
+            {   y += lines[line].letters[position].advanceX;
+                if (position>=lines[line].letters.length-1 || x > xy.x)
+                    break;
+                position++;
+            }
+             */
-            
-            return lineToCursor(line, position);
@@ -144 +163 @@
-    }
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -156 +235 @@
-     *     unicode = Unicode value of the pressed key.
-     *     cursor = The Surface's TextCursor. */
-, Style computedStyle
+
-    {   
-
-
+
+
+
+
+
+
+
+
+
+
+
-        assert(cursor.position <= letters.length);
-        static int xPosition; // save the cursor's x position when moving from one line to the next.
@@ -185 +273 @@
-                    int x = xPosition = xPosition ? xPosition : cursorToXy(cursor.position).x;
-                    x -= Line.getOffset(newLine.width, width, alignment);
- 
+
-                        x-= newLine.letters[i].advanceX; // find the cursor position for the previous x position
-i-1
+max(i-1, 0)
-                }
-                break;
@@ -196 +284 @@
-                    int x = xPosition = xPosition ? xPosition : cursorToXy(cursor.position).x;  
-                    x -= Line.getOffset(newLine.width, width, alignment);
- 
+
-                        x-= newLine.letters[i].advanceX;
-
+
+
+
-                }
-                break;
@@ -204 +294 @@
-                cursor.position -= linePosition;
-                break;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                break;
-            
@@ -230 +322 @@
-                    if (unicode=='\r')
-                        unicode='\n';
-                    //Log.trace(cast(int)unicode);
-                    
-                    // Get the style to use for a new letter
@@ -248 +339 @@
-            break;
-            
-
-
+
-        }
-        
-        lines = lettersToLines(letters.data, width, lines);
-        //Log.trace(lines.length);
-    }
-    
@@ -312 +401 @@
-                    result.overlayAndColor(letter.image, istyle.color, x+letter.left, baseline-letter.top);
-                    
-
+-
-                    if (istyle.textDecoration == Style.TextDecoration.UNDERLINE)
-                        for (int h=max(0, baseline); h<min(baseline+lineWidth, height); h++)
@@ -357 +446 @@
-    
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-     * Params:
-text
+html
-     *       The following html tags are supported:<br> 
-     *          a, b, br, del, i, span, sub, sup, u <br>
@@ -415 +454 @@
-     *         color, font-family, font-size[%|px], font-style[normal|italic|oblique], font-weight[normal|bold],
-     *         letter-spacing[%|px], line-height[%|px], 
-
+
+
+
+
+
+
+
+
+
+
+
-     *     style = A style with fontSize and lineHeight in terms of pixels
-     *     width = Available width for rendering text
@@ -421 +470 @@
-     * Returns: True if the text will need to be re-rendered, false otherwise.
-     * TODO: Should this be a constructor to maintain RAII? */
-char[] html, 
+
-    {
-        InlineStyle istyle = InlineStyle(style);
-        alignment = style.textAlign;
-        
-
-
-
+
+
+
+
+
+
-        if (newLetters)
-
-
-
+
-            styles.length = 0;
-style, letters, styles);
-   
-   this.html = html;
-   
-}
+istyle, letters, styles);           
+}
+
+
+htmlDirty = false;
-        
-        // If text or dimensions have changed
-        if (newLetters || width != this.width || height != this.height)
-
-
+
-            this.height = height;           
-            lines = lettersToLines(letters.data, width, lines);
-            return true;
-        }
+        
-        return false;
-    }
@@ -631 +681 @@
-     * Returns:
-     */
-
+Inline
-    {
-        char[] lookaside = Memory.allocate!(char)(htmlText.length+13); // +13 for <span></span> that surrounds it
@@ -646 +696 @@
-        }
-
-InlineStyle(style)
+style
-    }
-        
@@ -687 +737 @@
-        styles ~= style;
-        if (input.value.length)
-htmlE
+e
-            foreach (dchar c; text) // dchar to iterate over each utf-8 char group
-            {   if (style.fontFamily)
@@ -749 +799 @@
-     * Note that this could avoid heap activity altogether with lookaside buffers.
-     * See: http://en.wikipedia.org/wiki/Character_encodings_in_HTML#XML_character_entity_references */ 
-
-
+
+
+
-        text = text.substitute("&lt;", "<");
-        text = text.substitute("&gt;", ">");
@@ -761 +812 @@
-    {   char[] test = "<>Hello Goodbye&nbsp; &amp;&quot;&apos;&lt;&gt;";
-        char[] result="<>Hello Goodbye\&nbsp; &\"'<>";
-htmlE
+e
-    }
-}

trunk/src/yage/system/graphics/render.d

@@ -742 +742 @@
-            // Bind surface properties  
-            glPushMatrix();
+            glTranslatef(surface.left(), surface.top(), 0);
-            glMultMatrixf(surface.style.transform.ptr);
-            glTranslatef(surface.left(), surface.top(), 0);
-            surface.style.backfaceVisibility ? glDisable(GL_CULL_FACE) : glEnable(GL_CULL_FACE);
-            
+            // Render the surface
-            geometry(surface.getGeometry());
-            

trunk/src/yage/system/input.d

@@ -23 +23 @@
-abstract class Input
-{
+    /// This is a mirror of SDLMod (SDL's modifier key struct)
+    enum ModifierKey
+    {   NONE  = 0x0000, /// Allowed values.
+        LSHIFT= 0x0001, /// ditto
+        RSHIFT= 0x0002, /// ditto
+        LCTRL = 0x0040, /// ditto
+        RCTRL = 0x0080, /// ditto
+        LALT  = 0x0100, /// ditto
+        RALT  = 0x0200, /// ditto
+        LMETA = 0x0400, /// ditto
+        RMETA = 0x0800, /// ditto
+        NUM   = 0x1000, /// ditto
+        CAPS  = 0x2000, /// ditto
+        MODE  = 0x4000, /// ditto
+        RESERVED = 0x8000, /// ditto
+        CTRL  = LCTRL | RCTRL, /// ditto
+        SHIFT = LSHIFT | RSHIFT, /// ditto
+        ALT   = LALT | RALT, /// ditto
+        META  = LMETA | RMETA /// ditto
+    };  
+    
+    ///
+    enum MouseButton
+    {   LEFT=1, /// Allowed values.
+        CENTER, /// ditto
+        RIGHT, /// ditto
+        WHEEL_UP, /// ditto
+        WHEEL_DOWN, /// ditto
+        FOUR, /// ditto
+        FIVE, /// ditto
+        SIX, /// ditto
+        SEVEN, /// ditto
+        EIGHT /// ditto
+    }
+    
-    public static int KEY_DELAY = 500; /// milliseconds before repeating a call to keyPress after holding a key down.
-    public static int KEY_REPEAT = 30; /// milliseconds before subsequent calls to keyPress after KEY_DELAY occurs.
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    protected static Surface currentSurface;    // Surface that the mouse is currently over
-
@@ -37 +109 @@
-    static void processAndSendTo(Surface surface)
-    {
+        assert(surface);
-        
-        SDL_EnableUNICODE(1);
@@ -48 +121 @@
-                // Keyboard
-                case SDL_KEYDOWN:
-                    if(focus) // keysym.sym gets all keys on the keyboard, including separate keys for numpad, keysym.unicde should be reserved for text.
-                    {   focus.keyDown(event.key.keysym.sym, event.key.keysym.mod);
-                    
-
-
-
-
-
+
+
+
+
+
+
+
+
-                    break;
-                case SDL_KEYUP:                 
-
-
+
-                    if (event.key.keysym.sym==lastKeyDown.sym) // if the same key we're repeating
-                        lastKeyDownTime = uint.max; // stop repeating
@@ -66 +139 @@
-                // Mouse
-                case SDL_MOUSEBUTTONDOWN:
+                    mouse.fromMouseButton(event.button.button, true); // set                    
-                    auto over = getMouseSurface(surface);
-                    if(over) 
-
+
+
+
+
-    
-                    break;
-                case SDL_MOUSEBUTTONUP:
+                    mouse.fromMouseButton(event.button.button, false); // clear
-                    auto over = getMouseSurface(surface);
-                    if(over)
-
+
+
+
-    
-                    break;
-                case SDL_MOUSEMOTION:           
-
-
+position.
+position.
-                    
-                    // Doing this before getMouseSurface() fixes the mouse leaving the surface while dragging.
-                    if(currentSurface)
-
+
+
+
+
+
+
+
-    
-                    // If the surface that the mouse is in has changed
@@ -90 +176 @@
-                    {   
-                        if(currentSurface) //Tell it that the mouse left
-, event.button.button, mouse
-
-event.button.button, mouse
+
+ 
+
-                        
-                        currentSurface = over; //The new current surface
@@ -116 +202 @@
-        // Key repeat
-        if (focus)
-
-
+
-            if (now - KEY_DELAY > lastKeyDownTime)
-            {   focus.keyPress(lastKeyDown.sym, lastKeyDown.mod, lastKeyDown.unicode);
@@ -130 +215 @@
-        if(Surface.getGrabbedSurface()) 
-            return Surface.getGrabbedSurface();
-x, mouse.y
+position
-    }
-