Changeset 537

Timestamp:

06/07/08 03:35:15 (4 months ago)

Author:

krobillard

Message:

Added show, hide, and gui_setMouseFocus().
Quit & halt propogate up nested ur_eval() calls.
Thune-gl RPM builds again.

Location:

trunk/thune

Files:

• cmake_modules/FindThune.cmake (modified) (1 diff)
• cmake_modules/FindThuneGL.cmake (modified) (1 diff)
• doc/GLManual (modified) (1 diff)
• gl/CMakeLists.txt (modified) (2 diffs)
• gl/gui.c (modified) (14 diffs)
• gl/gui.h (modified) (2 diffs)
• gl/gx.c (modified) (2 diffs)
• thune-gl.spec (modified) (1 diff)
• thune.c (modified) (3 diffs)

trunk/thune/cmake_modules/FindThune.cmake

@@ -1 @@
-FIND_PATH(THUNE_INCLUDE_DIR urlan.h /usr/include /usr/local/include)
+FIND_PATH(THUNE_INCLUDE_DIR urlan.h /usr/include/thune /usr/local/include/thune)
 
 FIND_LIBRARY(THUNE_LIBRARY NAMES thune PATH /usr/lib64 /usr/local/lib64 /usr/lib /usr/local/lib) 

trunk/thune/cmake_modules/FindThuneGL.cmake

@@ -1 @@
-FIND_PATH(THUNEGL_INCLUDE_DIR thune-gl.h /usr/include /usr/local/include)
+FIND_PATH(THUNEGL_INCLUDE_DIR gx.h /usr/include/thune /usr/local/include/thune)
 
 FIND_LIBRARY(THUNEGL_LIBRARY NAMES thune-gl PATH /usr/lib64 /usr/local/lib64 /usr/lib /usr/local/lib) 

trunk/thune/doc/GLManual

@@ -155 +155 @@
 make-matrix        (vec3 -- matrix)
 =================  ======================  ======================
+
+
+Widget Functions
+----------------
+
+================  ======================  ======================
+Word              Stack Usage             Function
+================  ======================  ======================
+show              (widget -- )            Show widget
+show/focus        (widget -- )            Show widget and give it focus
+hide              (widget -- )            Hide widget
+================  ======================  ======================
 
 

trunk/thune/gl/CMakeLists.txt

@@ -72 +72 @@
     rfont.c
     shader.c
-#   gui.c
+    gui.c
     ${GLV_FILE}
     ${JOYSTICK_FILE}
@@ -114 +114 @@
 install(TARGETS thune-gl     DESTINATION /usr/local/bin)
 install(TARGETS thuneGL-lib  DESTINATION /usr/local/lib)
-#install(FILES   urlan.h     DESTINATION /usr/local/include)
+install(FILES   gx.h         DESTINATION /usr/local/include/thune)
+install(FILES   gui.h        DESTINATION /usr/local/include/thune)
+install(FILES   TexFont.h    DESTINATION /usr/local/include/thune)
 endif ()
 

trunk/thune/gl/gui.c

@@ -72 +72 @@
     for(it.id = ui->rootList; IS_VALID(it.id); it.id = it.w->next) { \
         it.w = WPTR(it.id);
+
+#define EACH_SHOWN_ROOT(it) \
+    EACH_ROOT(it) \
+        if( it.w->flags & GW_HIDDEN ) \
+            continue;
 
 #define EACH_END    }
@@ -121 +126 @@
 
 
-static void gui_freeWidgetP( GUI* ui, GWidget* w, GWidgetId id )
-{
-    GWidgetIt it;
-    GWidgetId next;
-
-    w->next = ui->firstFree;
-    ui->firstFree = id;
-
+static void gui_removeFocus( GUI* ui, GWidgetId id )
+{
     if( ui->mouseFocus == id )
     {
@@ -137 +136 @@
     if( ui->keyFocus == id )
         ui->keyFocus = NO_WID;
+}
+
+
+static void gui_freeWidgetP( GUI* ui, GWidget* w, GWidgetId id )
+{
+    GWidgetIt it;
+    GWidgetId next;
+
+    w->next = ui->firstFree;
+    ui->firstFree = id;
+
+    gui_removeFocus( ui, id );
 
     //EACH_CHILD( w, it )
@@ -896 +907 @@
     ui->ut         = ut;
     ui->style      = 0;
-    ui->root       = NO_WID;
     ui->keyFocus   = NO_WID;
     ui->mouseFocus = NO_WID;
@@ -956 +966 @@
 
 
+void gui_setKeyFocus( GUI* ui, GWidgetId id )
+{
+    ui->keyFocus = id;
+}
+
+
+void gui_setMouseFocus( GUI* ui, GWidgetId id )
+{
+    ui->mouseFocus = id;
+}
+
+
+void gui_grabMouse( GUI* ui, GWidgetId id )
+{
+    ui->mouseFocus = id;
+    ui->mouseGrabbed = 1;
+}
+
+
+void gui_ungrabMouse( GUI* ui, GWidgetId id )
+{
+    if( ui->mouseFocus == id )
+    {
+        ui->mouseGrabbed = 0;
+    }
+}
+
+
 static GWidget* childAt( GUI* ui, GWidget* wp, const GLViewEvent* ev )
 {
@@ -967 +1005 @@
 
 
-void gui_setKeyFocus( GUI* ui, GWidgetId id )
-{
-    ui->keyFocus = id;
-}
-
-
-void gui_grabMouse( GUI* ui, GWidgetId id )
-{
-    ui->mouseFocus = id;
-    ui->mouseGrabbed = 1;
-}
-
-
-void gui_ungrabMouse( GUI* ui, GWidgetId id )
-{
-    if( ui->mouseFocus == id )
-    {
-        ui->mouseGrabbed = 0;
-    }
+static GWidgetId widgetAt( GUI* ui, const GLViewEvent* ev )
+{
+    GWidgetIt it;
+    EACH_SHOWN_ROOT( it )
+        if( gui_widgetContains( it.w, ev->x, ev->y ) )
+        {
+            it.w = childAt( ui, it.w, ev );
+            return it.w ? WID(it.w) : NO_WID;
+        }
+    EACH_END
+    return NO_WID;
 }
 
@@ -994 +1024 @@
 
 #if 0
-    printf( "KR dispatch %d  root %d  mouseFocus %d  keyFocus %d\n",
-            ev->type, ui->root, ui->mouseFocus, ui->keyFocus );
+    printf( "KR dispatch %d  mouseFocus %d  keyFocus %d\n",
+            ev->type, ui->mouseFocus, ui->keyFocus );
 #endif
 
@@ -1004 +1034 @@
             // Convert window system origin from top of window to the bottom.
             ev->y = ui->rootH - ev->y;
+            // Fall through...
 
         case GLV_EVENT_WHEEL:
@@ -1031 +1062 @@
                                 ev->state, ev->x, ev->y );
                     CLASS( w ).dispatch( ui, w, &me );
-                    ui->mouseFocus = NO_WID;
                 }
             }
-            if( IS_VALID(ui->root) )
+
+            ui->mouseFocus = widgetAt( ui, ev );
+            if( IS_VALID(ui->mouseFocus) )
             {
-                GWidget* rw = WPTR(ui->root);
-                w = childAt( ui, rw, ev );
-                if( /*(w != rw) &&*/ (! (w->flags & GW_DISABLED)) )
+                w = WPTR(ui->mouseFocus);
+                if( ! (w->flags & GW_DISABLED) )
                 {
                     GLViewEvent me;
@@ -1044 +1075 @@
                                 ev->state, ev->x, ev->y );
                     CLASS( w ).dispatch( ui, w, &me );
-                    ui->mouseFocus = WID(w);
                     goto dispatch;
                 }
@@ -1060 +1090 @@
 
         case GLV_EVENT_FOCUS_IN:
+            ui->mouseFocus = widgetAt( ui, ev );
+            // Fall through...
+
         case GLV_EVENT_FOCUS_OUT:
-            goto root;
-    }
-
-root:
-
-    if( ! IS_VALID(ui->root) )
-        return;
-    w = WPTR(ui->root);
+            if( IS_VALID(ui->mouseFocus) )
+            {
+                w = WPTR(ui->mouseFocus);
+                goto dispatch;
+            }
+            break;
+    }
+    return;
 
 dispatch:
@@ -1170 +1203 @@
 
 /**
-  Returns pointer to root widget or zero if id is invalid.
+  Returns pointer to root parent widget or zero if id is invalid.
 */
 GWidget* gui_root( const GUI* ui, GWidgetId id )
@@ -1225 +1258 @@
     else if( ! hidden )
     {
+        GWidgetId id = WID(wp);
+        gui_removeFocus( ui, id );
         wp->flags |= GW_HIDDEN;
         markLayoutDirty( ui, wp->parent );
@@ -1339 +1374 @@
                         {
                             linkRoot( ui, wp, ms->wid );
-                            ui->root = ms->wid;
-
                             if( ! IS_VALID(ui->keyFocus) )
-                                ui->keyFocus = ui->root;
+                                ui->keyFocus = ms->wid;
                         }
                         //return wp;

trunk/thune/gl/gui.h

@@ -44 +44 @@
     UAtom     atom_action;
     UAtom     atom_text;
-    GWidgetId root;
     GWidgetId keyFocus;
     GWidgetId mouseFocus;
@@ -163 +162 @@
 GWidget* gui_root( const GUI* ui, GWidgetId id );
 void     gui_setKeyFocus( GUI*, GWidgetId );
+void     gui_setMouseFocus( GUI*, GWidgetId );
 void     gui_grabMouse( GUI*, GWidgetId );
 void     gui_ungrabMouse( GUI*, GWidgetId );

trunk/thune/gl/gx.c

@@ -721 +721 @@
 
 
+// (widget -- )
+UR_CALL( uc_show )
+{
+    if( ur_is(tos, UT_WIDGET) )
+    {
+        UCell* inv;
+        GWidgetId id = ur_int(tos);
+        GWidget* wp = gui_widgetPtr( &gxEnv.gui, id );
+        if( wp )
+        {
+            gui_show( &gxEnv.gui, wp, 1 );
+
+            inv = UR_CALL_CELL;
+            if( inv && (ur_sel(inv) == UR_ATOM_FOCUS) )
+            {
+                gui_setKeyFocus( &gxEnv.gui, id );
+                gui_setMouseFocus( &gxEnv.gui, id );
+            }
+        }
+    }
+    UR_S_DROP;
+}
+
+
+// (widget -- )
+UR_CALL( uc_hide )
+{
+    if( ur_is(tos, UT_WIDGET) )
+    {
+        GWidget* wp = gui_widgetPtr( &gxEnv.gui, ur_int(tos) );
+        if( wp )
+            gui_show( &gxEnv.gui, wp, 0 );
+    }
+    UR_S_DROP;
+}
+
+
 // (matrix vec3 -- )
 UR_CALL( uc_look_at )
@@ -1293 +1330 @@
     { uc_play,           "play" },
     { uc_stop,           "stop" },
+    { uc_show,           "show" },
+    { uc_hide,           "hide" },
     { uc_text_size,      "text-size" },
     { uc_display_events, "display.events" },

trunk/thune/thune-gl.spec

@@ -40 +40 @@
 mkdir include
 sed -e "s~\"urlan.h\"~<thune/urlan.h>~" gl/gui.h >include/gui.h
-sed -e "s~\"gui.h\"~<thune/gui.h>~" -e "s~\"TexFont.h\"~<thune/TexFontgui.h>~" gl/gx.h >include/gx.h
+sed -e "s~\"gui.h\"~<thune/gui.h>~" -e "s~\"TexFont.h\"~<thune/TexFont.h>~" gl/gx.h >include/gx.h
 install -m 644 include/gx.h  $RPM_BUILD_ROOT%{_includedir}/thune
 install -m 644 include/gui.h $RPM_BUILD_ROOT%{_includedir}/thune

trunk/thune/thune.c

@@ -773 +773 @@
 
                 case OP_HALT:
+                    UR_CALL_OP = OP_HALT;
                     EMH_HALT(pc, end)
                     goto halt;
@@ -778 +779 @@
                 case OP_QUIT:
                     UR_S_PUSH( *val );
+                    UR_CALL_OP = OP_QUIT;
                     goto quit;
 
@@ -1016 +1018 @@
 
                 case OP_HALT:
-                    UR_CALL_OP = 0;
+                    //UR_CALL_OP = 0;
                     goto halt;
 
                 case OP_QUIT:
-                    UR_CALL_OP = 0;
+                    //UR_CALL_OP = 0;
                     goto quit;