Changeset 48

Timestamp:

04/22/07 06:28:25 (2 years ago)

Author:

baxissimo

Message:

Finally fixed it so that the GUI can steal mouse clicks and the user can listen for everything else.

Files:

• trunk/luigi/adapter.d (modified) (5 diffs)
• trunk/luigi/adapters/gld.d (modified) (4 diffs)
• trunk/luigi/adapters/glfw.d (modified) (4 diffs)
• trunk/luigi/adapters/sdl.d (modified) (2 diffs)
• trunk/luigi/gui.d (modified) (6 diffs)
• trunk/luigi/theme.d (modified) (3 diffs)

trunk/luigi/adapter.d

@@ -51 +51 @@
-interface InputAdapter
-{
+    /// Get the size of the specified window, using an opaque
+    /// window handle.
+    Size get_window_size(WindowHandle h);
+
+
-    /**
-
-
-
-
-
+
+
+
+
-     */
-    void addKeyCallback(KeyEventFn cb)                 ;
@@ -90 +94 @@
-    void removeWindowCloseCallback(WindowCloseEventDg cb) ;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // addRaw Paint
@@ -124 +149 @@
-            windowSize = new WindowSizeEventSignal; 
-            windowClose = new WindowCloseEventSignal;
+
+            sysKey = new KeyEventSignal;
+            sysMouseButton = new MouseButtonEventSignal;
-        }
-    }
@@ -136 +164 @@
-        WindowSizeEventSignal  windowSize; 
-        WindowCloseEventSignal windowClose;
+
+        KeyEventSignal         sysKey;
+        MouseButtonEventSignal sysMouseButton;
-    }
-    private _LuigiSignals _lsig;
@@ -171 +202 @@
-    void removeWindowSizeCallback(WindowSizeEventDg cb)   {_lsig.windowSize.disconnect(cb);}  
-    void removeWindowCloseCallback(WindowCloseEventDg cb) {_lsig.windowClose.disconnect(cb);} 
+
+
+    // Implementation of InputAdapter
+    void addSysKeyCallback(KeyEventFn cb)                 {_lsig.sysKey.connect(cb);}
+    void addSysMouseButtonCallback(MouseButtonEventFn cb) {_lsig.sysMouseButton.connect(cb);}
+
+    // And again for delegates...
+    void addSysKeyCallback(KeyEventDg cb)                 {_lsig.sysKey.connect(cb);}
+    void addSysMouseButtonCallback(MouseButtonEventDg cb) {_lsig.sysMouseButton.connect(cb);}
+
+    // remove raw system callback
+    void removeSysKeyCallback(KeyEventFn cb)                 {_lsig.sysKey.disconnect(cb);}
+    void removeSysMouseButtonCallback(MouseButtonEventFn cb) {_lsig.sysMouseButton.disconnect(cb);};
+
+    // And again for delegates...
+    void removeSysKeyCallback(KeyEventDg cb)                 {_lsig.sysKey.disconnect(cb);}
+    void removeSysMouseButtonCallback(MouseButtonEventDg cb) {_lsig.sysMouseButton.disconnect(cb);};
+
+
+
-}
-

trunk/luigi/adapters/gld.d

@@ -32 +32 @@
-import luigi.adapter;
-private import gld;
-//import sslot.signal;
-import luigi.signalobj;
-
@@ -159 +158 @@
-    {
-        _KeyEvent ev;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    static void charCallbackC(int ch, int action)
@@ -177 +183 @@
-        // (e.g. european and asian) but it seems to be the case with GLD.
-        // Not every key has a char, but every char has a key in GLD
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    static void mouseButtonCallbackC(int button, int action)
@@ -190 +203 @@
-        int x,y;
-        gldGetMousePos(&x, &y);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    static void mousePosCallbackC(int x, int y)

trunk/luigi/adapters/glfw.d

@@ -5 +5 @@
-  luigi/adapter/glfw.d
-     -- GLFW input adapter for the 'Luigi' user interface library.
+     This was originally written for DerelictGLFW, but the Derelict
+     project has since decided to abandon the project.
+     There are supposedly D bindings distributed with GLFW, so you can
+     link to it directly without Derelict's help.
+
+     This is made to work with Derelict's former GLFW.  Should be
+     easy to get it working with the D bindings that come with GLFW, or
+     just use GLD, the all-D native port of GLFW for D.
+     The Luigi GLD bindings are better tested than these.
-
-  Copyright (C) 2006 William V. Baxter III
@@ -159 +168 @@
-    {
-        _KeyEvent ev;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    static void charCallbackC(int ch, int action)
@@ -177 +193 @@
-        // (e.g. european and asian) but it seems to be the case with GLFW.
-        // Not every key has a char, but every char has a key in GLFW
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    static void mouseButtonCallbackC(int button, int action)
@@ -190 +213 @@
-        int x,y;
-        glfwGetMousePos(&x, &y);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    static void mousePosCallbackC(int x, int y)

trunk/luigi/adapters/sdl.d

@@ -356 +356 @@
-    {
-        _KeyEvent ev;
-ev.key
-ev.mods = inst._getMods()
+int k
+dchar ch
-        if (SDL_EnableUNICODE(-1)) {
-ev.
+
-        }
-        else {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return ev.alive;
-    }
@@ -378 +387 @@
-        }
-        _MouseButtonEvent ev; 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return ev.alive;
-    }

trunk/luigi/gui.d

@@ -54 +54 @@
-   getter rather than the setter.
- */
-
-module luigi.gui;
-
@@ -87 +86 @@
- * Holds GUI globals including the theme, the input adapter, and keeps track
- * of all the top-level Frames and Overlays.
-
+ 
-class Luigi
-{
-    /// Return the singleton instance
-
+
+
-        static Luigi instance = null;
-        if (!instance) instance = new Luigi;
@@ -168 +168 @@
-        // add in top-level input hooks
-        with (m_inputsys) {
-
-
+Sys
+Sys
-            addMouseMoveCallback(&ov.on_sys_mouse_move);
-            addMouseWheelCallback(&ov.on_sys_mouse_wheel);
@@ -209 +209 @@
-
-
-system-level input callback
+user-level input callback functions and delegates
-void add_key_callback(KeyEventFn cb)                  {Luigi().adapter.addKeyCallback(cb);}
+void add_key_callback(KeyEventDg cb)                  {Luigi().adapter.addKeyCallback(cb);}
-void add_mouse_button_callback(MouseButtonEventFn cb) {Luigi().adapter.addMouseButtonCallback(cb); }
+void add_mouse_button_callback(MouseButtonEventDg cb) {Luigi().adapter.addMouseButtonCallback(cb);}
-void add_mouse_move_callback(MouseMoveEventFn cb)     {Luigi().adapter.addMouseMoveCallback(cb);}
+void add_mouse_move_callback(MouseMoveEventDg cb)     {Luigi().adapter.addMouseMoveCallback(cb);}
-void add_mouse_wheel_callback(MouseWheelEventFn cb)   {Luigi().adapter.addMouseWheelCallback(cb);}
+void add_mouse_wheel_callback(MouseWheelEventDg cb)   {Luigi().adapter.addMouseWheelCallback(cb);}
-void add_window_size_callback(WindowSizeEventFn cb)   {Luigi().adapter.addWindowSizeCallback(cb);}
+void add_window_size_callback(WindowSizeEventDg cb)   {Luigi().adapter.addWindowSizeCallback(cb);}
-void add_window_close_callback(WindowCloseEventFn cb) {Luigi().adapter.addWindowCloseCallback(cb);}
-
+
+
+
+
+
+
+
+
+
-void remove_key_callback(KeyEventFn cb)                  {Luigi().adapter.removeKeyCallback(cb);}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -1342 +1357 @@
-    override void on_key(KeyEvent ev)
-    {
-
+ && !ev.is_char
-            if (ev.key == Key.Space ||
-                ev.key == Key.Enter ||
@@ -1696 +1711 @@
-            return m_increment;
-        }
-
+ && !ev.is_char
-            switch(ev.key) 
-            {

trunk/luigi/theme.d

@@ -180 +180 @@
-        if (f) f(item, ev);
-        if (!f || ev.alive) { item.on_key(ev); }
+        else {ev.alive=true;}
-    }
-    override void on_mouse_button(Widget item, MouseButtonEvent ev) 
@@ -186 +187 @@
-        if (f) f(item, ev);
-        if (!f || ev.alive) { item.on_mouse_button(ev); }
+        else { ev.alive=true; }
-    }
-    override void on_mouse_move(Widget item, MouseMoveEvent ev) 
@@ -192 +194 @@
-        if (f) f(item, ev);
-        if (!f || ev.alive) { item.on_mouse_move(ev); }
-
-
-
-
-
+
+
+
+
+
+