Changeset 33

Timestamp:

12/04/06 02:17:31 (2 years ago)

Author:

baxissimo

Message:

Got SDL adapter working.
Also made a doc.brf for compiling docs.

Files:

• trunk/luigi/adapter.d (modified) (1 diff)
• trunk/luigi/adapters/gld.d (modified) (2 diffs)
• trunk/luigi/adapters/glfw.d (modified) (3 diffs)
• trunk/luigi/adapters/sdl.d (added)
• trunk/luigi/all.d (added)
• trunk/luigi/doc.brf (added)
• trunk/luigi/event.d (modified) (3 diffs)
• trunk/luigi/example1_gld.brf (modified) (1 diff)
• trunk/luigi/example1_sdl.brf (added)
• trunk/luigi/example1_sdl.d (added)
• trunk/luigi/gldraw.d (modified) (4 diffs)
• trunk/luigi/gui.d (modified) (11 diffs)

trunk/luigi/adapter.d

@@ -135 +135 @@
-    void addWindowSizeCallback(WindowSizeEventDg cb)   {_lsig.windowSize.connect(cb);}  
-    void addWindowCloseCallback(WindowCloseEventDg cb) {_lsig.windowClose.connect(cb);} 
-
-}
-

trunk/luigi/adapters/gld.d

@@ -87 +87 @@
-    case GLD_KEY_HOME: return Key.Home;
-    case GLD_KEY_END: return Key.End;
-_
-_
-_
-_
-_
-_
-_
-_
-_
-_
+
+
+
+
+
+
+
+
+
+
-    case GLD_KEY_KP_DIVIDE: return Key.KP_Divide;
-    case GLD_KEY_KP_MULTIPLY: return Key.KP_Multiply;
@@ -102 +102 @@
-    case GLD_KEY_KP_ADD: return Key.KP_Add;
-    case GLD_KEY_KP_DECIMAL: return Key.KP_Decimal;
-
+s
-    case GLD_KEY_KP_ENTER: return Key.KP_Enter;
-    default:

trunk/luigi/adapters/glfw.d

@@ -32 +32 @@
-import luigi.adapter;
-import derelict.glfw.glfw;
-//import sslot.signal;
-import luigi.signalobj;
-
@@ -87 +86 @@
-    case GLFW_KEY_HOME: return Key.Home;
-    case GLFW_KEY_END: return Key.End;
-_
-_
-_
-_
-_
-_
-_
-_
-_
-_
+
+
+
+
+
+
+
+
+
+
-    case GLFW_KEY_KP_DIVIDE: return Key.KP_Divide;
-    case GLFW_KEY_KP_MULTIPLY: return Key.KP_Multiply;
@@ -102 +101 @@
-    case GLFW_KEY_KP_ADD: return Key.KP_Add;
-    case GLFW_KEY_KP_DECIMAL: return Key.KP_Decimal;
-
+s
-    case GLFW_KEY_KP_ENTER: return Key.KP_Enter;
-    default:

trunk/luigi/event.d

@@ -123 +123 @@
-    LAlt,    Alt = LAlt,
-    RAlt,
+    LMeta,
+    RMeta,
+    LSuper,
+    RSuper,
+    Mode,
+    Compose,
-    Tab,
-    Enter,
@@ -132 +138 @@
-    Home,
-    End,
-_
-_
-_
-_
-_
-_
-_
-_
-_
-_
+
+
+
+
+
+
+
+
+
+
-    KP_Divide,
-    KP_Multiply,
@@ -147 +153 @@
-    KP_Add,
-    KP_Decimal,
-
+s
-    KP_Enter,
+
+    NumLock,
+    CapsLock,
+    ScrollLock,
+
+    Help,
+    Print,
+    SysReq,
+    Break,
+    Menu,
+    Power,
+    Euro,
+    Undo,
-}
-

trunk/luigi/example1_gld.brf

@@ -3 +3 @@
--I$(DMDDIR)\baxissimo
--I$(DMDDIR)\ext
-
--version=useDerelict
--full

trunk/luigi/gldraw.d

@@ -365 +365 @@
-}
-
+void checkGLErrors(char[] file = null, int line = 0)
+{
+    GLenum err;
+    while ( (err=glGetError()) != GL_NO_ERROR) 
+    {
+        char[] errstr;
+        if (file) errstr = std.string.format("OpenGL error: %s(%s): ", file, line);
+        switch(err) {
+        case GL_INVALID_ENUM:
+            // An unacceptable value is specified for an enumerated
+            // argument. The offending command is ignored, having no
+            // side effect other than to set the error flag.
+            errstr ~= "Invalid enum";
+            break;
+        case GL_INVALID_VALUE:
+            //A numeric argument is out of range. The offending command is
+            //ignored, having no side effect other than to set the error
+            //flag.
+            errstr ~= "Invalid value"; 
+            break;
+        case GL_INVALID_OPERATION:
+            //The specified operation is not allowed in the current
+            //state. The offending command is ignored, having no side
+            //effect other than to set the error flag.
+            errstr ~= "Invalid operation"; 
+            break;
+
+        case GL_STACK_OVERFLOW:
+            // This command would cause a stack overflow. The
+            // offending command is ignored, having no side effect
+            // other than to set the error flag.
+            errstr ~= "Stack overflow"; 
+            break;
+
+        case GL_STACK_UNDERFLOW:
+            //  This command would cause a stack underflow. The
+            //  offending command is ignored, having no side effect
+            //  other than to set the error flag.
+            errstr ~= "Stack underflow"; 
+            break;
+
+        case GL_OUT_OF_MEMORY:
+            //  There is not enough memory left to execute the
+            //  command. The state of the GL is undefined, except for
+            //  the state of the error flags, after this error is
+            //  recorded.
+            errstr ~= "Out of memory";
+            break;
+        default:
+            errstr ~= std.string.format("Unknown error code: %s", err);
+        }
+        writefln(errstr);
+    }
+}
+
+
-//----------------------------------------------------------------------------
-void push_graphics_state(Rect viewport) {
@@ -374 +430 @@
-                 );
-    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_TEXTURE_2D);
-    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
-    glViewport(0,0,lrint(viewport.w),lrint(viewport.h));
-    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
-    glLoadIdentity();
-    // Note! We put the origin at top left to match window sys conventions
@@ -383 +445 @@
-            -1,1);
-    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
-    glLoadIdentity();
-}
@@ -393 +456 @@
-    glPopMatrix();
-    // TODO restore viewport?
-
+
+
+
+

trunk/luigi/gui.d

@@ -443 +443 @@
-    }
-
+    /** Sets the keyboard focus of this widget's hierarchy to newfocus.
+     *  If newfocus is null any current focus item in this widget tree 
+     *  will be unfocused.
+     */
+    bool set_focus(Widget newfocus)
+    in {  get_root()._focus_sanity_check(); } body
+    {
+        if (newfocus) {
+            if (!newfocus.focusable) return false;
+            if (newfocus.m_focused) return true;
+        }
+
+        // unfocus the current guy first
+        Widget oldFocus = get_focus();
+        if (oldFocus && !oldFocus._can_lose_focus()) {
+            return false;
+        }
+        else if (oldFocus) {
+            oldFocus._unfocus_rup();
+        }
+        
+        // Stop here if there's no new focus item
+        if (!newfocus) return true;
+
+        // now give focus to the new guy.
+        // Set his m_focused flag and percolate m_childFocused flags up the chain.
+        _FocusEvent ev;
+        ev.previous = oldFocus;
+        newfocus.on_focus(&ev);
+        if (!ev.alive) {
+            newfocus.m_focused = true;
+            if (newfocus.parent) newfocus.parent._set_child_focused_rup();
+        }
+        return newfocus.m_focused;
+    }
+
+
-    /** Set the keyboard focus to this item.
-        Returns true if successful, false otherwise.
@@ -449 +486 @@
-    in {  get_root()._focus_sanity_check(); } body
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -1049 +1065 @@
-
-    /** Constructor.  Not every toolkit supports multiple windows (e.g. GLFW,SDL).
-won'
+may no
-    */
-    this(WindowHandle win = null) {
@@ -1055 +1071 @@
-        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);
@@ -1067 +1084 @@
-    }
-
+    /** Return the input adapter in current use.  Equivalent to Luigi().adapter. */
+    InputAdapter adapter() {
+        return Luigi().adapter;
+    }
+
-protected:
-    override bool _set_mouse_grabber(Widget w)
@@ -1096 +1118 @@
-        if (focus) {
-            Luigi().theme.on_key(focus,ev);
+        } else {
+            ev.alive = true;
-        }
-        if ((!focus || ev.alive) && ev.is_press) 
@@ -1102 +1126 @@
-            // (and also sys hotkeys? Ctrl-X etc)
-
-
+
+
+
+
+
+
+
-                if (ev.mods == KeyMods.None) {
-                    focus_next();
+                    ev.alive = false;
-                }
-                else if (ev.mods == KeyMods.Shift) {
-                    focus_prev();
+                    ev.alive = false;
-                }
-            }
+        }
+        else if (!focus) {
+            ev.alive = true;
-        }
-    }
@@ -1126 +1161 @@
-            _xform_event_to_widget(target, ev);
-            Luigi().theme.on_mouse_button(target, ev);
+        }
+        else {
+            ev.alive = true;
-        }
-    }
@@ -1179 +1217 @@
-    }
-
-
+  
-
-private:
@@ -1321 +1359 @@
-    }
-}
+
+/// An alternate spelling for Checkbox, because I can never remember which it is.
+alias Checkbox CheckBox;
-
-class TextField : Widget
@@ -1532 +1573 @@
-}
-
+/// An alternate spelling for TextField, because I can never remember which it is.
+alias TextField Textfield;
+
-/**
- * Slider represents a floating point value.  Since it uses a double for