Changeset 11

Timestamp:

11/25/06 08:01:52 (2 years ago)

Author:

baxissimo

Message:

You can manipulate the slider now.
Also changed events to be struct pointers instead of inout, because inout doesn't seem to work in a template parameter right now.
Also switch everything over std.signals/signalobj instead of Lutger's sslot class.

Files:

• trunk/luigi/adaptor/base.d (modified) (3 diffs)
• trunk/luigi/adaptor/glfw.d (modified) (7 diffs)
• trunk/luigi/arranger.d (modified) (6 diffs)
• trunk/luigi/base.d (modified) (1 diff)
• trunk/luigi/event.d (modified) (9 diffs)
• trunk/luigi/example1.brf (modified) (1 diff)
• trunk/luigi/example1.d (modified) (4 diffs)
• trunk/luigi/gui.d (modified) (38 diffs)
• trunk/luigi/signalobj.d (modified) (3 diffs)
• trunk/luigi/theme.d (modified) (17 diffs)

trunk/luigi/adaptor/base.d

@@ -28 +28 @@
-module luigi.adaptor.base;
-
-
+
+
-import luigi.base;
-import luigi.event;
@@ -89 +90 @@
-{
-    //-------------------------------------------------------
-
+sig.*.
-    // Use example:  
-    //       KeyEvent ev;
-    //       [...build KeyEvent from native data...]
-emit.key
+sig.key.emit
-
-    // You MUST call this from your Adaptor's constructor!
@@ -118 +119 @@
-    }
-    private _LuigiSignals _lsig;
-
-
+
-
-    // Implementation of InputAdaptor
-
-
-
-
-
-
+f
+f
+f
+f
+f
+f
-
-    // And again for delegates...
-
-
-
-
-
-
+f
+f
+f
+f
+f
+f
-
-}

trunk/luigi/adaptor/glfw.d

@@ -32 +32 @@
-import luigi.adaptor.base;
-import derelict.glfw.glfw;
-
+
+
-
-import std.stdio : writefln;
@@ -157 +158 @@
-    static void keyCallbackC(int k, int action)
-    {
-
+_
-        ev.key = translate_key(k);
-        m_lastKey = ev.key;
@@ -165 +166 @@
-        ev.is_key = true;
-        ev.is_char = false;
-emit.key(
+sig.key.emit(&
-    }
-    static void charCallbackC(int ch, int action)
-    {
-
+_
-        // In practice it seems that char callbacks always come _after_
-        // key callbacks. (That's probably the case for any sane operating system).
@@ -182 +183 @@
-        ev.is_key = false;
-        ev.is_char = true;
-emit.key(
+sig.key.emit(&
-    }
-    static void mouseButtonCallbackC(int button, int action)
-    {
-MouseButtonEvent ev;
+_MouseButtonEvent ev; 
-        int x,y;
-        glfwGetMousePos(&x, &y);
@@ -198 +199 @@
-        else if (button == GLFW_MOUSE_BUTTON_MIDDLE) ev.button = MouseButtons.Middle;
-        
-emit.mouseButton(
+sig.mouseButton.emit(&
-    }
-    static void mousePosCallbackC(int x, int y)
-    {
-
+_
-        ev.x = ev.winx = x;
-        ev.y = ev.winy = y;
@@ -208 +209 @@
-        ev.mods = inst._getMods();
-
-emit.mouseMove(
+sig.mouseMove.emit(&
-    }
-    static void mouseWheelCallbackC(int pos)
-    {
-
+_
-        int x,y;
-        glfwGetMousePos(&x, &y);
@@ -222 +223 @@
-        inst.m_lastWheelPos = pos;
-
-emit.mouseWheel(
+sig.mouseWheel.emit(&
-    }
-    static void windowSizeCallbackC(int width, int height)
-    {
-
+_
-        ev.w = width;
-        ev.h = height;
-emit.windowSize(
+sig.windowSize.emit(&
-    }
-    static int  windowCloseCallbackC()
-    {
-
-emit.windowClose(
+_
+sig.windowClose.emit(&
-        return true;
-    }

trunk/luigi/arranger.d

@@ -231 +231 @@
-
-    override void add(Arrangeable item, ...)
-{
+in { 
-        assert(_arguments.length == 0, "FlowArranger.add does not take arguments");
+    }
+    body{
-        m_items ~= item;
-        return item;
@@ -238 +240 @@
-
-    override void remove(Arrangeable item, ...)
-
+in 
-        assert(_arguments.length == 0, "FlowArranger.remove does not take arguments");
+    }
+    body{
-        m_items.drop_item(item);
-    }
@@ -566 +570 @@
-
-    override  void add(Arrangeable item, ...)
-
+in
-        assert(_arguments.length == 0, "GridArranger.add does not take arguments");
+    }
+    body{
-        m_items ~= item;
-        return item;
@@ -573 +579 @@
-
-    override  void remove(Arrangeable item, ...)
-
+in 
-        assert(_arguments.length == 0, "GridArranger.remove does not take arguments");
+    }
+    body{
-        m_items.drop_item(item);
-    }
@@ -814 +822 @@
-
-    override  void add(Arrangeable item, ...)
-
-
+
+
+
-        if (_arguments.length == 1) {
-            assert(_arguments[0] == typeid(Region));
-        }
-
+
+
-        Region place;
-        if (_arguments.length == 1) {
@@ -868 +878 @@
-
-    override  void remove(Arrangeable item, ...)
-
+in
-        assert(_arguments.length <= 1, "BorderArranger.remove takes one argument, a Region.");
-        if (_arguments.length == 1) {
-            assert(_arguments[0] == typeid(Region));
-        }
-
+
+
-        if (item != null) { 
-            if (item == m_north) { m_north = null; }

trunk/luigi/base.d

@@ -96 +96 @@
-        else {            y+=v; h-=2*v; }
-    }
+
+    /** Intersection of two rects. */
+    void intersect(Rect o) {
+
+    }
+    /** Grow rect to enclose other rect (union of rects.) */
+    void enclose(Rect o) {
+        enclose(o.pos);
+        enclose(Point(o.x2,o.y2));
+    }
+    /** Grow rect to enclose point p. */
+    void enclose(Point p) {
+        if (p.x < x) {  w = x2-p.x;  x = p.x; }
+        else if (p.x > x2) {  x2 = p.x; }
+        if (p.y < y) {  h = y2-p.y;  y = p.y; }
+        else if (p.y > y2) {  y2 = p.y; }
+    }
+
-
-    char[] toString() {

trunk/luigi/event.d

@@ -29 +29 @@
-module luigi.event;
-
-
+
+
-import luigi.base;
-
@@ -152 +153 @@
-
-
-
-
-
-
-
-
-
-
-
+
-{
-    union {
@@ -180 +173 @@
-    bool is_char;
-    bool is_key;
-
-
-
+
+
+
+
+
+
+
-{
-    union {
@@ -195 +192 @@
-    bool is_release() { return !is_press; }
-    MouseButtons button;
+    bool is_left() { return (button & MouseButtons.Left)!=0; }
+    bool is_right() { return (button & MouseButtons.Right)!=0; }
+    bool is_middle() { return (button & MouseButtons.Middle)!=0; }
-    MouseButtons pressed;
-    bool left_down() { return (pressed & MouseButtons.Left)!=0; }
@@ -203 +203 @@
-    bool ctrl_down() { return (mods & KeyMods.Ctrl)!=0; }
-    bool alt_down() { return (mods & KeyMods.Alt)!=0; }
-
-
-
+
+
+
+
+
+
+
-{
-    union {
@@ -223 +227 @@
-    bool ctrl_down() { return (mods & KeyMods.Ctrl)!=0; }
-    bool alt_down() { return (mods & KeyMods.Alt)!=0; }
-
-
-
+
+
+
+
+
+
+
-{
-    union {
@@ -244 +252 @@
-    bool ctrl_down() { return (mods & KeyMods.Ctrl)!=0; }
-    bool alt_down() { return (mods & KeyMods.Alt)!=0; }
-
-
-
+
+
+
+
+
+
+
-{
-    WindowHandle id;
@@ -252 +264 @@
-    alias width w;
-    alias height h;
-
-
-
+
+
+
+
+
+
+
-{
-    WindowHandle id;
+
+    bool is_alive = false;
+    bool alive(bool tf) { return is_alive=tf; }
+    bool alive() { return is_alive; }
-}
-
@@ -262 +282 @@
-/// extern luigi.gui.Widget;
-
-
+_
-{
-    Object previous;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/luigi/example1.brf

@@ -1 @@
-
-
+
--I$(DMDDIR)\baxissimo
--I$(DMDDIR)\ext

trunk/luigi/example1.d

@@ -56 +56 @@
-}
-
-
-// doesn't work .. ICE if you try to use this
-class CoolTarget(T...)
-{
-    this( void delegate(T) dg) { fn = dg; }
-    void slot(T args) {
-        fn(args);
-    }
-    void delegate(T) fn;
-}
-class BDelegate
-{
-    alias void delegate(luigui.Widget, bool) func_t;
-    this(func_t dg) { fn = dg; }
-    void slot(luigui.Widget w, bool b) {
-        fn(w,b);
-    }
-    func_t fn;
-}
-class VDelegate
-{
-    alias void delegate(luigui.Widget) func_t;
-    this(func_t dg) { fn = dg; }
-    void slot(luigui.Widget w) {
-        fn(w);
-    }
-    func_t fn;
-}
-
-void main(char[][] argv)
@@ -155 +127 @@
-            });
-*/
-BDelegate( 
+DelegateSlot!(Widget,bool)(
-                (Widget w, bool onoff)
-                { 
@@ -173 +145 @@
-            Button b4 = g.add_widget(new Button("Click me!"));
-            //b4.clicked.connect( (Widget w){ writefln("Ouch! Not so hard!"); } ); 
-VDelegate
+DelegateSlot!(Widget)
-            b4.clicked.connect( &T.slot );
-        }
@@ -195 +167 @@
-            Button b29 = arranged( g.add_widget(new Button("Tool9")));
-            Slider s01 = arranged( g.add_widget(new Slider("Thingy")));
-
-
+
+
+
+
+
+
+
+
+
-        }
-

trunk/luigi/gui.d

@@ -31 +31 @@
-  William Baxter wbaxter@gmail.com
-*/
+
+/*
+  WARNING: Because of how overloading works in D as of 0.174, 
+           ** ALL SETTERS SHOULD COME BEFORE GETTERS **
+  I.e.
+
+          int value(int newval)
+
+   should always appear before 
+
+          int value()
+
+   Otherwise, signal.fconnect will connect to the getter rather 
+   than the setter.
+ */
-
-module luigi.gui;
@@ -75 +90 @@
-    }
-
+    Theme theme(Theme th) { return m_theme=th; }
-    Theme theme() { return m_theme; }
-
@@ -272 +288 @@
-
-
+    void enable(bool isEnabled=true) { return m_enabled = isEnabled; }
+    void disable() { m_enabled = false; }
-    bool enabled() { return m_enabled; }
-    bool disabled() { return !m_enabled; }
-    void enable(bool isEnabled=true) { return m_enabled = isEnabled; }
-    void disable() { m_enabled = false; }
-    
-    void show() { m_shown = true; }
-    void hide() { m_shown = false; }
+    bool shown(bool show_) { return m_shown = show_; }
-    bool shown() { return m_shown; }
-    bool shown(bool show_) { return m_shown = show_; }
-
-
@@ -367 +383 @@
-    }
-
-    bool focusable() 
-    in {  get_root()._focus_sanity_check(); } body
-    { 
-        return m_focusable && m_enabled;
-    }
-
-    bool focusable(bool onOff) 
-    in {  get_root()._focus_sanity_check(); } body
@@ -391 +401 @@
-    }
-
+    bool focusable() 
+    in {  get_root()._focus_sanity_check(); } body
+    { 
+        return m_focusable && m_enabled;
+    }
+
-    /** Finds the keyboard focus of this widget's hierarchy. */
-    Widget get_focus()
@@ -428 +444 @@
-        // now focus this guy.
-        // Set his m_focused flag and percolate m_childFocused flags up the chain.
-
+_
-        ev.previous = oldFocus;
-int ret = this.on_focus(
-ret==EventStatus.OK
+this.on_focus(&
+!ev.alive
-            m_focused = true;
-            if (parent) parent._set_child_focused_rup();
@@ -536 +552 @@
-    //---------------------------------------------------
-    // Base widget event handling
-
-
-
-
-
+
+
+
+
-    {
-        alias .toString str;
+        version (LuigiTrace)
-        writefln("button %s %s: ",str(ev.button), ev.is_press?"press":"release", 
-                 "(%s) [%s] ", str(ev.pressed), str(ev.mods), 
-                 "(%0.1f,%0.1f) - ", ev.x-rect.x, ev.y-rect.y,
-                 this);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        // TODO: do focus change notifications for those who care?
-        Button b = cast(Button)this;
-
-
-
+
+
+
+
+
+
-    int stretch_x() { return m_stretchx; }
-    int stretch_y() { return m_stretchy; }
-    void stretch(ubyte both)       { m_stretchx = m_stretchy = both; }
-    void stretch(ubyte x, ubyte y) { m_stretchx = x; m_stretchy = y; }
-
-    //------------------------------------------------------------------------
@@ -691 +706 @@
-    }
-
-    override Arranger arranger() { return super.arranger(); }
-    override Arranger arranger(Arranger a) { 
-        super.arranger(a);
@@ -703 +717 @@
-        return arranger; 
-    }
+    override Arranger arranger() { return super.arranger(); }
-    
-    override Widget[] children() { return m_children; }
@@ -1046 +1061 @@
-
-    // Top-level event interface callbacks
-int
+void
-        // find the innermost focus item and send it the key event
-        Widget focus = get_focus();
-
-
-
-
-
+
+
+
+
-        {
-            // if the key wasn't consumed, check for tab/shift-tab
@@ -1067 +1081 @@
-            }
-        }
-
-
-
-
+
+
-    {
-        Widget target;
@@ -1080 +1092 @@
-        }
-        if (target) {
-  TODO: click_focusable attribute?
+
-            target.focus();
-            _event_to_widget(target, ev);
-
-
-
-
-
+
+
+
+
-    {
-        Widget target;
@@ -1098 +1109 @@
-        if (target) {
-            _event_to_widget(target, ev);
-
-
-
-
-
+
+
+
+
-    {
-        Widget target;
@@ -1113 +1123 @@
-        if (target) {
-            _event_to_widget(target, ev);
-return target.on_mouse_wheel(
+Luigi().theme.on_mouse_wheel(target, 
-        }
-        return 0;
-    }
-
-
-
-
-
+
+
+
+
-    {
-        //writefln("Size changed! : %f, %f", ev.w, ev.h);
-        set_rect(Rect(0,0,ev.w, ev.h));
-        return 0;
-    }
-
@@ -1172 +1180 @@
-interface Valuator
-{
+    /** Set the current value as a double */
+    double value(double);
-    /** Get the current value as a double */
-    double value();
-    /** Set the current value as a double */
-    double value(double);
-}
-
@@ -1183 +1191 @@
-    mixin WidgetMixin;
-
-int on_key(inout 
+void on_key(
-    {
-        if (ev.is_press) {
@@ -1191 +1199 @@
-            {
-                clicked.emit(this);
- EventStatus.Dead
-
-
-return EventStatus.Aliv
+
+
+
+ev.alive = tru
-    }
-    
-int on_mouse_button(inout 
-
-return EventStatus.Alive;
+void on_mouse_button(
+
+{ ev.alive=true; return; }
-
-        alias MouseButtons b;
@@ -1211 +1219 @@
-            m_depressed = false;
-        }
-
-
-
-
-
-
+
+
+
+
+
-
-        if (is_grabbing_mouse())
-        {
-            m_depressed = rect.contains(ev.p);
-
-
-
-
-
+
+
+
+
-
-    this(char[] label_) {
@@ -1249 +1255 @@
-    mixin WidgetMixin;
-
+    override double value(double v) { return m_checked=(v!=0); }
-    override double value() { return m_checked; }
-
-
-
+
+
-    {
-        if (ev.is_press) {
@@ -1261 +1267 @@
-                m_checked = !m_checked;
-                value_changed.emit(this,m_checked);
- EventStatus.Dead
-
-
-return EventStatus.Aliv
+
+
+
+ev.alive = tru
-    }
-    
-int on_mouse_button(inout 
-
-return EventStatus.Alive;
+void on_mouse_button(
+
+{ ev.alive=true; return; }
-
-        alias MouseButtons b;
@@ -1284 +1290 @@
-            m_depressed = false;
-        }
-
-
-
-
-
-
+
+
+
+
+
-
-        if (is_grabbing_mouse())
-        {
-            m_depressed = rect.contains(ev.p);
-
-
-
+
+
-    }
-
@@ -1323 +1327 @@
-    mixin WidgetMixin;
-
-int on_key(inout 
+void on_key(
-    {
-        if (ev.is_press) {
@@ -1333 +1337 @@
-            {
-                switch(ev.key) {
+                case Key.Tab:
+                case Key.Escape:
+                    // pass tab & escape through
+                    ev.alive = true;
+                    return;
-                case 'A':
-                    if (ev.ctrl_down) {
@@ -1402 +1411 @@
-                case Key.Enter:
-                case Key.KP_Enter:
-
-return EventStatus.Dead
+, m_text
+break
-                default:
-                    ;
@@ -1409 +1418 @@
-            }
-        }
-        return EventStatus.Alive;
-    }
-    
-int on_mouse_button(inout 
-
-return EventStatus.Alive;
+void on_mouse_button(
+
+{ ev.alive = true;  return; }
-
-        alias MouseButtons b;
@@ -1423 +1431 @@
-            if (is_grabbing_mouse()) {release_mouse();}
-        }
-
-
-
-
-
-
+
+
+
+
+
-
-        if (is_grabbing_mouse())
-        {
- EventStatus.Dead
-
-return EventStatus.Aliv
+
+
+ev.alive = tru
-    }
-
@@ -1454 +1461 @@
-        // launch selection changed notificaiton
-    }
+    int selection_start(int begin)   { return sel_begin = begin; }
+    int selection_end(int after_end) { return sel_end = after_end; }
-    int selection_start()            { return sel_begin; }
-    int selection_end()              { return sel_end; }
-    int selection_start(int begin)   { return sel_begin = begin; }
-    int selection_end(int after_end) { return sel_end = after_end; }
-    int selection_length()           { return sel_end-sel_begin; }
-
@@ -1481 +1488 @@
-
-
+    char[] text(char[] t) { 
+        if (m_text is t || (m_text && t && m_text == t)) return m_text;
+        m_text = t;
+        text_accepted.emit(this, m_text);
+        return m_text;
+    }
-    char[] text() { return m_text; }
-    char[] text(char[] t) { return m_text=t; }
-
-
@@ -1496 +1508 @@
-    char [] label;
-
-
+, char[]
-    TextAcceptedSignal text_accepted;
-    // mixin Signal!(Widget) text_accepted;
@@ -1524 +1536 @@
-}
-
+/**
+ * Slider represents a floating point value.  Since it uses a double for 
+ * internal representation of the value it can also easily handle integral
+ * numbers as large (larger even) than an int.
+ *
+ * The model used for tracking the value is that users can
+ * programmatically set any value they wish using value() and it will
+ * be honored.  However manipulations of the value through the UI are
+ * restricted to integer multiples of the precision.  Zero is always
+ * attainable via the UI as long as it is between max and min.
+ */
-class Slider : Widget, Valuator
-{
-    mixin WidgetMixin;
-
-
-
+
-        if (v<m_min) v=m_min;
-        if (v>m_max) v=m_max;
-        if (v==m_value) return m_value;
+
+        // want to have (m_value = prec * i) for some integer i
+        real prec = precision;
+        double i = lrint(v/prec);
+        v = prec * i;
+        if (v==m_value) return m_value;
+
-        m_value = v;
-        value_changed.emit(this,v);
-
-
+
+
+
-
-    this(char[] label_) {
@@ -1545 +1575 @@
-    }
-
-
+
+
+
+
+
+