Changeset 99:5de5810e3516

Timestamp:

11/14/08 07:44:32 (2 months ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

branch:

default

Message:

Implemented an editable TextContent? widget; it's now possible to edit text options using the GUI.

The widget supports moving the text entry-point using arrows and home/end, but there's no visual indicator or edit-point setting using the mouse.

Files:

• data/conf/gui.mtt (modified) (1 diff)
• mde/gui/WidgetManager.d (modified) (6 diffs)
• mde/gui/content/Content.d (modified) (3 diffs)
• mde/gui/renderer/IRenderer.d (modified) (1 diff)
• mde/gui/renderer/SimpleRenderer.d (modified) (1 diff)
• mde/gui/widget/Floating.d (modified) (2 diffs)
• mde/gui/widget/Ifaces.d (modified) (2 diffs)
• mde/gui/widget/TextWidget.d (modified) (1 diff)
• mde/gui/widget/Widget.d (modified) (3 diffs)
• mde/gui/widget/createWidget.d (modified) (3 diffs)
• mde/gui/widget/layout.d (modified) (3 diffs)
• mde/gui/widget/miscContent.d (modified) (2 diffs)
• mde/gui/widget/textContent.d (added)
• mde/input/Input.d (modified) (14 diffs)

data/conf/gui.mtt

@@ -15 +15 @@
-<WidgetData|optVal={0:[0x6030]}>
-<WidgetData|optSep={0:[0x21, 0xff],1:["="]}>
-
-21,0xE0E000],1:["Floating text"
+3
+4032
-<WDims|content=[736,221,272,79]>
-<WDims|root=[6,736,50,6,580,6]>

mde/gui/WidgetManager.d

@@ -103 +103 @@
-        IChildWidget widg = child.getWidget (cast(wdabs)cx,cast(wdabs)cy);
-        //debug logger.trace ("Click on {}", widg);
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
@@ -183 +192 @@
-    }
-    
+    void preSave () {
+    if (keyFocus) {
+        keyFocus.keyFocusLost;
+        keyFocus = null;
+        imde.input.setLetterCallback (null);
+    }
+    }
+    
-private:
+    IRenderer rend;
+    wdim w,h;       // area available to the widgets
+    wdim mw,mh;     // minimal area available to the widgets
-    // callbacks indexed by their frame pointers:
-    bool delegate(wdabs cx, wdabs cy, ubyte b, bool state) [void*] clickCallbacks;
-    void delegate(wdabs cx, wdabs cy) [void*] motionCallbacks;
-
-
-
+
-}
-
@@ -287 +305 @@
-    */
-    void loadDesign (char[] name = null) {
-
+  // A design was previously loaded
-            save;       // own lock
-            
-            
+   
-        scope(exit) mutex.unlock;
-        
@@ -316 +334 @@
-        
-        mt.IDataSection* q = name in changesDS.sec;
-
-
+
-            changes = new WidgetDataChanges (curData);
-            changesDS.sec[name] = changes;
@@ -330 +347 @@
-    * Is run when the manager is destroyed, but could be run at other times too. */
-    void save () {
+    preSave;
+    
-        mutex.lock;
-        scope(exit) mutex.unlock;
@@ -455 +474 @@
-    void createRootWidget();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

mde/gui/content/Content.d

@@ -21 +21 @@
-import Int = tango.text.convert.Integer;
-import Float = tango.text.convert.Float;
+import derelict.sdl.keysym;
-
-debug {
@@ -152 +153 @@
-        symb = symbol;
-        v = val;
+    pos = v.length;
-    }
-    
@@ -178 +180 @@
-    alias opCall opCast;
-    
+    /** Acts on a keystroke and returns the new value.
+     *
+     * Supports one-line editing: left/right, home/end, backspace/delete. */
+    char[] keyStroke (ushort sym, char[] i) {
+    debug assert (i.length, "TextContent.keyStroke: no value (??)");    // impossible?
+    char k = *i;
+    if (k > 0x20) {
+        if (k == 0x7f) {        // delete
+        size_t p = pos;
+        if (p < v.length) ++p;
+        while (p < v.length && (v[p] & 0x80) && !(v[p] & 0x40))
+            ++p;
+        v = v[0..pos] ~ v[p..$];
+        } else {            // insert character
+        char[] tail = v[pos..$];
+        v.length = v.length + i.length;
+        size_t npos = pos+i.length;
+        if (tail) v[npos..$] = tail.dup;    // cannot assign with overlapping ranges
+            v[pos..npos] = i;
+        pos = npos;
+        }
+    } else {            // use sym; many keys output 0
+        if (sym == SDLK_BACKSPACE) {    // backspace; k == 0x8
+        char[] tail = v[pos..$];
+        if (pos) --pos;
+        while (pos && (v[pos] & 0x80) && !(v[pos] & 0x40))
+            --pos;
+        v = v[0..pos] ~ tail;
+        } else if (sym == SDLK_LEFT) {
+        if (pos) --pos;
+        while (pos && (v[pos] & 0x80) && !(v[pos] & 0x40))
+            --pos;
+        } else if (sym == SDLK_RIGHT) {
+        if (pos < v.length) ++pos;
+        while (pos < v.length && (v[pos] & 0x80) && !(v[pos] & 0x40))
+            ++pos;
+        } else if (sym == SDLK_HOME || sym == SDLK_UP) {
+        pos = 0;
+        } else if (sym == SDLK_END || sym == SDLK_DOWN) {
+        pos = v.length;
+        } else
+        debug logger.trace ("Symbol: {}", sym);
+    }
+    return v;
+    }
+    
+    /// Gives all callbacks the modified value
+    void endEdit () {
+    foreach (cb; cngCb)
+        cb(symb, v);
+    }
+    
-    char[] v;
-protected:
-    char[] symb;
+    size_t pos;     // editing position; used by keyStroke
-    void delegate (char[],char[])[] cngCb;
-}

mde/gui/renderer/IRenderer.d

@@ -88 +88 @@
-     * interfaces when available to allow flexibility. */
-    struct TextAdapter {
- (char[] c, int col
+Text (char[] c
-            content = c;
-
+
-        }
+    
+    void setColour (int col = 0xFFFFFF) {
+        colour = Colour (col);
+    }
-        
-        void getDimensions (out wdsize w, out wdsize h) {

mde/gui/renderer/SimpleRenderer.d

@@ -134 +134 @@
-        TextAdapter a;
-        a.font = defaultFont;
-
+
+
-        return a;
-    }

mde/gui/widget/Floating.d

@@ -150 +150 @@
-    }
-    
-void
-
+int
+ 0
-        if (b == 1 && state == true) {
-            active = event;
@@ -181 +181 @@
-            }
-        }
+    return 0;
-    }
-    

mde/gui/widget/Ifaces.d

@@ -103 +103 @@
-     * gui. */
-    void addMotionCallback (void delegate (wdabs cx, wdabs cy) dg);
-    
-    // FIXME: keyboard callback (letter only, for text input? Also used for setting keybindings though...)
-    
-    /** Remove all event callbacks on this widget (according to the delegate's .ptr). */
@@ -237 +235 @@
-    IChildWidget getWidget (wdim x, wdim y);
-    
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-//END Events
-    

mde/gui/widget/TextWidget.d

@@ -77 +77 @@
-{
-    this (IWidgetManager mgr, widgetID id, WidgetData data, IContent c) {
-        debug assert (c, "content is null (code error)");
-        WDCheck (data, 3, 0);
-        content = c;

mde/gui/widget/Widget.d

@@ -124 +124 @@
-    
-    /* Dummy event method (suitable for all widgets which don't respond to events). */
-
+
+
+
+
+
+
+
-//END Events
-    
@@ -222 +228 @@
-    
-    /// Handles the down-click
-void
+int
-        if (b == 1 && state == true) {
-            pushed = true;
@@ -229 +235 @@
-            mgr.addMotionCallback (&motionWhilePushed);
-        }
+    return 0;
-    }
-    

mde/gui/widget/createWidget.d

@@ -29 +29 @@
-import mde.gui.widget.TextWidget;
-import mde.gui.widget.miscContent;
+import mde.gui.widget.textContent;
-import mde.gui.widget.Floating;
-import tango.util.log.Log : Log, Logger;
@@ -83 +84 @@
-/// Widget types.
-enum WIDGET_TYPE : int {
-                
-           
-                  
+       
+  
+     
-    
-    // Use widget names rather than usual capitals convention
-                 
+        
-    
-    // blank: 0x1
-              
-            
-                   
+     
+   
+      
-    
-    // buttons: 0x10
-                  
+     
-    
-    // labels: 0x20
-    
-               
+
+      
-    
-    // content editables: 0x30
-
-
-
+
+
+
+
-    
-              
-      
+     
+ 
-    
-            
+   
-}
-
@@ -125 +127 @@
-        "DisplayContent",
-        "BoolContent",
+    "TextContent",
-        "editContent",
-        "TrialContentLayout",

mde/gui/widget/layout.d

@@ -248 +248 @@
-    
-    // Resizing columns & rows
-void
+int
-        debug scope (failure)
-                logger.warn ("clickEvent: failure");
@@ -258 +258 @@
-            // find col/row's resizeD & resizeU
-            if (col.findResizeCols (cx - x) && row.findResizeCols (cy - y))
-
+ 0
-            
-            dragX = cx;
@@ -266 +266 @@
-            mgr.addMotionCallback (&resizeCallback);
-        }
+    return 0;
-    }
-    

mde/gui/widget/miscContent.d

@@ -17 +17 @@
-module mde.gui.widget.miscContent;
-
+import mde.gui.widget.textContent;
-import mde.gui.widget.Widget;
-import mde.gui.widget.TextWidget;
@@ -28 +29 @@
-    if (cast(BoolContent) c)
-        return new BoolContentWidget(mgr,id,data,c);
+    else if (cast(TextContent) c)
+    return new TextContentWidget(mgr,id,data,c);
-    else        // generic uneditable option
-        return new DisplayContentWidget(mgr,id,data,c);

mde/input/Input.d

@@ -26 +26 @@
-// sdl imports
-import derelict.sdl.events;
+import derelict.sdl.keyboard;
-import derelict.sdl.types;  // only SDL_PRESSED
-import derelict.sdl.joystick;   // SDL_HAT_*
-
+import Utf = tango.text.convert.Utf;
-import tango.util.log.Log : Log, Logger;
-
-
+
+
- *
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * ---
- * void getMouseScreenPos (out uint x, out uint y);
@@ -40 +82 @@
- * ---
- *
- * The following methods are provided for mouse (and joystick ball) relative motion input:
- * ---
- * void getRelMotion (inputID id, out real x = 0.0, out real y = 0.0);
- * void addRelMotionCallback (inputID id, RelMotionCallback dg);
- * ---
- *
- * The following methods are provided for joystick axis input:
- * ---
- * short getAxis (inputID id);
- * real getAxis1 (inputID id);
- * void addAxisCallback (inputID id, AxisCallback dg);
- * ---
- *
- * The following methods are provided for keyboard, joystick and mouse button input:
- * ---
- * bool getButton (inputID id);
- * void addButtonCallback (inputID id, ButtonCallback dg)
- * ---
- *
- * The following methods are provided for setup & posting events:
- * ---
-
-
-
+   // Handles an event, making all the above work
+  // Needs to be called once per frame for correct relative input
+    // Configuration for interaction-mode indexes
- * ---
- ***************************************************/
-// FIXME: remove getMouseScreenPos (no use)?
-// FIXME: add an Axis1Callback similar to getAxis1? Or remove getAxis1 and provide a conversion
-// function?
-class Input
-{
@@ -75 +95 @@
-    alias void delegate(inputID, bool)      ButtonCallback;
-    alias void delegate(inputID, short)     AxisCallback;
-
-
-
+
+
+
+
-
-    /** Get key status at this ID.
@@ -98 +119 @@
-    /** Get axis status at this ID.
-    *
-real
-real
+double
+double
-        short* retp = id in axis;
-        if (retp) return (*retp) * 3.0518509475997192e-05;
-        else return 0.0;
-    }
-        
+
-    /** Get the relative motion of the mouse or a joystick ball (since last frameReset() call).
-    *
-real
+double
-    *
-    * To avoid confusion over the ID here, the idea is for the input-layer upward to support
@@ -113 +134 @@
-    * Also joystick balls (supported by SDL) can be used in the same way as a mouse for relative
-    * positions. */
-real x = 0.0, out real
+double x = 0.0, out double
-        RelPair* rp = id in relMotion;
-        if (rp) {
@@ -119 +140 @@
-        }
-    }
-    /** Get mouse pointer position in screen coordinates.
-    *
-    * Window managers only support one mouse, so there will only be one screen coordinate.
-    * Unlike nearly everything else, this is not configurable.
-    *
-    * Also see addMouseMotionCallback. */
-    void getMouseScreenPos (out uint x, out uint y) {
-        x = mouse_x;    y = mouse_y;
-    }
-    // /// Is this modifier on?
-    //bool modifierStatus (inputID id);
-
-    /** Adds a callback delegate for key events (both DOWN and UP) with this ID.
@@ -176 +186 @@
-    void addMouseMotionCallback (MouseMotionCallback dg) {
-        mouseMotionCallbacks ~= dg;
+    }
+    
+    /** Sets a callback delegate to recieve key presses as a Utf-8 char[].
+    *
+    * Since it is normal to type into only one location at once, setting a new LetterCallback
+    * removes the last set one (however active ButtonCallbacks will still receive events).
+    * Supplying a null delegate will turn off the slight overhead of unicode conversion.
+    * 
+    * The char[] received by the delegate must be copied and not stored or edited directly. */
+    void setLetterCallback (LetterCallback dg = null) {
+        if (dg) {
+        SDL_EnableUNICODE (1);
+        SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+    } else {
+        SDL_EnableUNICODE (0);
+        SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
+    }
+        letterCallback = dg;
-    }
-
@@ -208 +236 @@
-            
-            case SDL_MOUSEMOTION:
-                mouse_x = event.motion.x;
-                mouse_y = event.motion.y;
-                
-                foreach (dg; mouseMotionCallbacks) {
-                    try
@@ -230 +255 @@
-            // Keyboard events:
-            case SDL_KEYDOWN:
+                if (letterCallback)
+            letterCallback (event.key.keysym.sym, Utf.toString ([cast(wchar)event.key.keysym.unicode], cast(char[])utfBuf));
-            case SDL_KEYUP:
+        if (letterCallback) break;  // text input mode; no keyboard input from mappings
-                outQueue[]* p = (Config.B.SDLKEY | event.key.keysym.sym) in config.button;
-                if (p) foreach (outQueue q; *p) {
@@ -371 +399 @@
-    
-    struct RelPair {    // for mouse/joystick ball motion
-real
-real a, real
+double
+double a, double
-            RelPair ret;
-            ret.x = a;  ret.y = b;
@@ -383 +411 @@
-    static Logger logger;
-
-   
-
-bool[inputID] button;      // Table of button states
-short[inputID] axis;       // Table of axes
-ushort mouse_x, mouse_y;       // Current screen coords of the window manager mouse
-   
+
+char[6] utfBuf;        // Buffer for Utf.toString; reallocates if less than 5.
+
+bool[inputID] button;  // Table of button
+short[inputID] axis;   // Table of axes states
+
-    
-    // NOTE: currently no means of removal
@@ -396 +424 @@
-    MouseClickCallback[]    mouseClickCallbacks;
-    MouseMotionCallback[]   mouseMotionCallbacks;
-
+
+
-    //BEGIN Event stream functionality
-    /* This section contains functions called on an event, which may modify the event (adjuster
@@ -579 +608 @@
-            counters[3] += 1;
-        });
-real x, real
+double x, double
-            assert (x == 14.0);
-            assert (y == -1.0);
@@ -661 +690 @@
-        assert (ut.getAxis1(0x22F0) == 0.0);
-            
-real
+double
-        ut.getRelMotion(0x10F0, s,t);
-        assert (s == 14.0);