Changeset 46

Timestamp:

02/16/07 22:09:34 (2 years ago)

Author:

baxissimo

Message:

Added top level add_blah_callback calls in gui.d to hook the system-level input routines. May rethink this a bit still. That may be wanted in some cases (reshape, or recording all mouse motion for example) , but probably more useful would be routines that get called as a _fallback_ when no gui widget intercepts the event.

Fixed disconnect in signalobj.d

Added disconnect routines to adapter.d

Fixed dxut to work without Derelict.

Files:

• trunk/luigi/adapter.d (modified) (3 diffs)
• trunk/luigi/examples/example1_gld.brf (modified) (1 diff)
• trunk/luigi/examples/example1_gld.d (modified) (2 diffs)
• trunk/luigi/examples/example1_glfw.brf (modified) (1 diff)
• trunk/luigi/examples/example1_sdl.brf (modified) (1 diff)
• trunk/luigi/examples/example1d_glfw.brf (modified) (1 diff)
• trunk/luigi/gui.d (modified) (2 diffs)
• trunk/luigi/opengl.d (modified) (1 diff)
• trunk/luigi/signalobj.d (modified) (5 diffs)
• trunk/luigi/themes/dxut.d (modified) (2 diffs)

trunk/luigi/adapter.d

@@ -51 +51 @@
-interface InputAdapter
-{
-
-
-
-
+
+
+
+
+
+
+
-    void addKeyCallback(KeyEventFn cb)                 ;
-    void addMouseButtonCallback(MouseButtonEventFn cb) ;
@@ -69 +72 @@
-    void addWindowSizeCallback(WindowSizeEventDg cb)   ;
-    void addWindowCloseCallback(WindowCloseEventDg cb) ;
+
+
+    // remove raw system callback
+    void removeKeyCallback(KeyEventFn cb)                 ;
+    void removeMouseButtonCallback(MouseButtonEventFn cb) ;
+    void removeMouseMoveCallback(MouseMoveEventFn cb)     ;
+    void removeMouseWheelCallback(MouseWheelEventFn cb)   ;
+    void removeWindowSizeCallback(WindowSizeEventFn cb)   ;
+    void removeWindowCloseCallback(WindowCloseEventFn cb) ;
+
+    // And again for delegates...
+    void removeKeyCallback(KeyEventDg cb)                 ;
+    void removeMouseButtonCallback(MouseButtonEventDg cb) ;
+    void removeMouseMoveCallback(MouseMoveEventDg cb)     ;
+    void removeMouseWheelCallback(MouseWheelEventDg cb)   ;
+    void removeWindowSizeCallback(WindowSizeEventDg cb)   ;
+    void removeWindowCloseCallback(WindowCloseEventDg cb) ;
-
-    Size get_window_size(WindowHandle h);
@@ -135 +155 @@
-    void addWindowSizeCallback(WindowSizeEventDg cb)   {_lsig.windowSize.connect(cb);}  
-    void addWindowCloseCallback(WindowCloseEventDg cb) {_lsig.windowClose.connect(cb);} 
+
+    // Implementation of InputAdapter
+    void removeKeyCallback(KeyEventFn cb)                 {_lsig.key.disconnect(cb);}
+    void removeMouseButtonCallback(MouseButtonEventFn cb) {_lsig.mouseButton.disconnect(cb);}
+    void removeMouseMoveCallback(MouseMoveEventFn cb)     {_lsig.mouseMove.disconnect(cb);}
+    void removeMouseWheelCallback(MouseWheelEventFn cb)   {_lsig.mouseWheel.disconnect(cb);}
+    void removeWindowSizeCallback(WindowSizeEventFn cb)   {_lsig.windowSize.disconnect(cb);}
+    void removeWindowCloseCallback(WindowCloseEventFn cb) {_lsig.windowClose.disconnect(cb);} 
+
+    // And again for delegates...
+    void removeKeyCallback(KeyEventDg cb)                 {_lsig.key.disconnect(cb);}         
+    void removeMouseButtonCallback(MouseButtonEventDg cb) {_lsig.mouseButton.disconnect(cb);} 
+    void removeMouseMoveCallback(MouseMoveEventDg cb)     {_lsig.mouseMove.disconnect(cb);}   
+    void removeMouseWheelCallback(MouseWheelEventDg cb)   {_lsig.mouseWheel.disconnect(cb);}  
+    void removeWindowSizeCallback(WindowSizeEventDg cb)   {_lsig.windowSize.disconnect(cb);}  
+    void removeWindowCloseCallback(WindowCloseEventDg cb) {_lsig.windowClose.disconnect(cb);} 
-}
-

trunk/luigi/examples/example1_gld.brf

@@ -8 +8 @@
--full
--cleanup
--version=useDerelict
--I$(DMDDIR)\baxissimo
-
-
-
-
-
+
+
+
+
-example1_gld
-# GLD only works as a library currently
-
-
-
-
+
+
+
+
+
+
+

trunk/luigi/examples/example1_gld.d

@@ -42 +42 @@
-
-import gld;
-
-
+
+
+
+
+
+
+
+
-import std.string;
-import std.stdio : writefln;
@@ -49 +55 @@
-static this()
-{
-
-
+
+
+
+
-    gldInit();
-}

trunk/luigi/examples/example1_glfw.brf

@@ -8 +8 @@
--full
--cleanup
+-version=useDerelict
--I$(DMDDIR)\baxissimo
-ex
-ex
-ex
-ex
-ex
+dmd\impor
+dmd\impor
+dmd\impor
+dmd\impor
+dmd\impor
-example1_glfw

trunk/luigi/examples/example1_sdl.brf

@@ -10 +10 @@
--version=useDerelict
--I$(DMDDIR)\baxissimo
-
-
-
-
-
+
+
+
+
-example1_sdl.d

trunk/luigi/examples/example1d_glfw.brf

@@ -9 +9 @@
--full
--cleanup
+-version=useDerelict
--I$(DMDDIR)\baxissimo
-ex
-ex
-ex
-ex
-ex
+dmd\impor
+dmd\impor
+dmd\impor
+dmd\impor
+dmd\impor
--Texample1d_glfw
-example1_glfw

trunk/luigi/gui.d

@@ -207 +207 @@
-    char[][] m_resource_path;
-}
+
+
+/// Add a system-level input callback
+void add_key_callback(KeyEventFn cb)                  {Luigi().adapter.addKeyCallback(cb);}
+void add_mouse_button_callback(MouseButtonEventFn cb) {Luigi().adapter.addMouseButtonCallback(cb); }
+void add_mouse_move_callback(MouseMoveEventFn cb)     {Luigi().adapter.addMouseMoveCallback(cb);}
+void add_mouse_wheel_callback(MouseWheelEventFn cb)   {Luigi().adapter.addMouseWheelCallback(cb);}
+void add_window_size_callback(WindowSizeEventFn 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);}
+//void add_mouse_button_callback(MouseButtonEventFn cb) {Luigi().adapter.addMouseButtonCallback(cb); }
+//void add_mouse_move_callback(MouseMoveEventFn cb)     {Luigi().adapter.addMouseMoveCallback(cb);}
+//void add_mouse_wheel_callback(MouseWheelEventFn cb)   {Luigi().adapter.addMouseWheelCallback(cb);}
+//void add_window_size_callback(WindowSizeEventFn cb)   {Luigi().adapter.addWindowSizeCallback(cb);}
+//void add_window_close_callback(WindowCloseEventFn cb) {Luigi().adapter.addWindowCloseCallback(cb);}
+
+
+/// ditto
+void add_key_callback(KeyEventDg cb)                  {Luigi().adapter.addKeyCallback(cb);}
+void add_mouse_button_callback(MouseButtonEventDg cb) {Luigi().adapter.addMouseButtonCallback(cb);}
+void add_mouse_move_callback(MouseMoveEventDg cb)     {Luigi().adapter.addMouseMoveCallback(cb);}
+void add_mouse_wheel_callback(MouseWheelEventDg cb)   {Luigi().adapter.addMouseWheelCallback(cb);}
+void add_window_size_callback(WindowSizeEventDg cb)   {Luigi().adapter.addWindowSizeCallback(cb);}
+void add_window_close_callback(WindowCloseEventDg cb) {Luigi().adapter.addWindowCloseCallback(cb);}
+
-
-
@@ -1121 +1147 @@
-        hostwin = win;
-        Size sz = Luigi().get_window_size(win);
-        writefln("Window size = ", sz);
-        set_rect(Rect(0,0,sz.w,sz.h));
-        Luigi().add_overlay(this);

trunk/luigi/opengl.d

@@ -31 +31 @@
-module luigi.opengl;
-
+version(useDerelict) {
-public import derelict.opengl.gl;
+} else {
+public import gl;
+}
-
-

trunk/luigi/signalobj.d

@@ -125 +125 @@
-     * be implicitly converted at runtime is allowed.
-     * 
-
+n
-     * method taking a (double,char[]) because int is automatically 
-     * promoted to double.
@@ -187 +187 @@
-    void disconnect(DT)(DT f) { 
-        static if( is(DT==slot_t) ) {
-_exact
+
-        }
-        else {
@@ -200 +200 @@
-
-            if (f_key in thunkMap) {
-_exact
+
-            } else {
-                debug writefln("FlexSignal.fdisconnect: Slot not found");
@@ -362 +362 @@
-    
-    auto sig1 = new SignalObj!(int);
-_exact
-_exact
+
+
-
-    writefln(">>> SignalObject EMIT");
@@ -435 +435 @@
-//----------------------------------------------------------------------------
-// needed to run tests
-
-
+
+
+
+

trunk/luigi/themes/dxut.d

@@ -38 +38 @@
-import std.perf;
-
+version (useDerelict) {
-import derelict.opengl.extension.arb.texture_compression;
+} else {
+    private
+    {
+        PFNGLCOMPRESSEDTEXIMAGE3DARBPROC         glCompressedTexImage3DARB;
+        PFNGLCOMPRESSEDTEXIMAGE2DARBPROC         glCompressedTexImage2DARB;
+        PFNGLCOMPRESSEDTEXIMAGE1DARBPROC         glCompressedTexImage1DARB;
+        PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC      glCompressedTexSubImage3DARB;
+        PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC      glCompressedTexSubImage2DARB;
+        PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC      glCompressedTexSubImage1DARB;
+        PFNGLGETCOMPRESSEDTEXIMAGEARBPROC        glGetCompressedTexImageARB;
+
+        version(Windows)
+            import win32.wingdi; // for wgl funcs
+        else version(linux)
+            version = UsingGLX;
+        version(UsingGLX)
+            import x11.glx;
+        import string=std.string;
+
+        bool glBindExtFunc(void **ptr, char[] funcName)
+        {
+            version(Windows)
+                *ptr = wglGetProcAddress(string.toStringz(funcName));
+            else version(UsingGLX)
+                *ptr = glXGetProcAddress(string.toStringz(funcName));
+            return (*ptr !is null);
+        }
+    }
+}
+
-static const GLint GL_COMPRESSED_RGB_S3TC_DXT1_EXT  = 0x83F0;
-static const GLint GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
@@ -44 +75 @@
-static const GLint GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
-
+
+
-void initialize_compressed_texture_extension()
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        throw new Exception("Unable to initialize texture compression extension");
+    }
-}
-