Mercurial > MadButterfly

changeset 217:8d9d717c9300

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add sample code fro mb_button_t. If everything is OK, I will move it to the main src tree.
author wycc@wycc-desktop
date Sat, 13 Dec 2008 17:13:31 +0800
parents f61b709bbd0f
children 064ff6318dfc ad5c7a5c2c39
files examples/dynamic/button.svg examples/dynamic/main.c
diffstat 2 files changed, 207 insertions(+), 153 deletions(-) [+]
line wrap: on
line diff
--- a/examples/dynamic/button.svg	Sat Dec 13 07:42:01 2008 +0800
+++ b/examples/dynamic/button.svg	Sat Dec 13 17:13:31 2008 +0800
@@ -29,7 +29,7 @@
      inkscape:cx="239.91999"
      inkscape:cy="667.92389"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g2430"
      showgrid="false"
      inkscape:window-width="1400"
      inkscape:window-height="978"
@@ -77,26 +77,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 526.18109 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter4376"
-       x="-0.035928786"
-       width="1.0718576"
-       y="-0.10908499"
-       height="1.21817">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.3893179"
-         id="feGaussianBlur4378" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4833">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0722832"
-         id="feGaussianBlur4835" />
-    </filter>
   </defs>
   <metadata
      id="metadata7">
@@ -125,92 +105,90 @@
          x="235.71429"
          y="282.36218" /></text>
     <g
-       id="normal"
-       inkscape:label="#g6113"
-       transform="translate(460,87.142857)">
-      <rect
-         transform="matrix(0.3740158,0,0,0.5340908,-66.07426,-121.9757)"
-         ry="16"
-         rx="16"
-         y="235.93361"
-         x="181.42857"
-         height="118.57143"
-         width="360"
-         id="rect6048"
-         style="fill:#008fff;fill-opacity:1;filter:url(#filter4376)" />
-      <rect
-         ry="8.5454531"
-         rx="5.9842529"
-         y="0.60081911"
-         x="1.2485654"
-         height="63.327908"
-         width="134.64569"
-         id="rect6050"
-         style="fill:#008fff;fill-opacity:1" />
-      <rect
-         ry="8.5454531"
-         rx="5.9842529"
-         y="0.21933411"
-         x="0.7142942"
-         height="63.327908"
-         width="134.64569"
-         id="rect6052"
-         style="fill:#008fff;fill-opacity:1" />
-      <text
-         inkscape:label="#text4385"
-         id="text6054"
-         y="48.076523"
-         x="26.428562"
-         style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;filter:url(#filter4833);font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           y="48.076523"
-           x="26.428562"
-           id="tspan6056"
-           sodipodi:role="line">Line</tspan></text>
-    </g>
-    <g
-       id="active"
-       inkscape:label="#g6103"
-       transform="translate(102.85714,85.714284)">
-      <rect
-         transform="matrix(0.3740158,0,0,0.5340908,-66.788541,-122.68999)"
-         ry="16"
-         rx="16"
-         y="235.93361"
-         x="181.42857"
-         height="118.57143"
-         width="360"
-         id="rect4074"
-         style="fill:#0000ff;filter:url(#filter4376)" />
-      <rect
-         ry="8.5454531"
-         rx="5.9842529"
-         y="-0.11346204"
-         x="0.53429729"
-         height="63.327908"
-         width="134.64569"
-         id="rect3240"
-         style="fill:#0000ff" />
-      <rect
-         ry="8.5454531"
-         rx="5.9842529"
-         y="-0.49495196"
-         x="-3.9397582e-07"
-         height="63.327908"
-         width="134.64569"
-         id="rect3242"
-         style="fill:#0000ff;fill-opacity:1" />
-      <text
-         inkscape:label="#text4385"
-         id="title"
-         y="47.362209"
-         x="25.714287"
-         style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4833);font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           y="47.362209"
-           x="25.714287"
-           id="tspan4387"
-           sodipodi:role="line">Line</tspan></text>
+       transform="translate(20.000001,42.857139)"
+       id="btn"
+       frame="click"
+       mbname="btn">
+      <g
+         id="g2430"
+         mbname="btn"
+         transform="translate(-78.571429,44.285714)">
+        <g
+           frame="normal"
+           id="btn_normal"
+           mbname="btn_normal"
+           transform="translate(1.4285713e-7,-60)">
+          <rect
+             style="fill:#0000ff"
+             id="rect2493"
+             width="82.85714"
+             height="42.857143"
+             x="220"
+             y="69.505035"
+             rx="5.4543843"
+             ry="7.1427469" />
+          <text
+             xml:space="preserve"
+             style="font-size:24px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+             x="232.85715"
+             y="99.505043"
+             id="text2495"><tspan
+               sodipodi:role="line"
+               id="tspan2497"
+               x="232.85715"
+               y="99.505043">Rect</tspan></text>
+        </g>
+        <g
+           frame="active"
+           id="btn_active"
+           mbname="btn_active"
+           transform="translate(-1.4285757,30.000005)">
+          <rect
+             style="fill:#00ffff"
+             id="rect2481"
+             width="82.85714"
+             height="42.857143"
+             x="220"
+             y="69.505035"
+             rx="5.4543843"
+             ry="7.1427469" />
+          <text
+             xml:space="preserve"
+             style="font-size:24px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+             x="232.85715"
+             y="99.505043"
+             id="text2483"><tspan
+               sodipodi:role="line"
+               id="tspan2485"
+               x="232.85715"
+               y="99.505043">Rect</tspan></text>
+        </g>
+        <g
+           frame="click"
+           id="btn_click"
+           mbname="btn_click"
+           transform="translate(-1.4285715,117.14286)">
+          <rect
+             style="fill:#0000ff"
+             id="rect2488"
+             width="82.85714"
+             height="42.857143"
+             x="220"
+             y="69.505035"
+             rx="5.4543843"
+             ry="7.1427469" />
+          <text
+             xml:space="preserve"
+             style="font-size:24px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+             x="232.85715"
+             y="99.505043"
+             id="text2490"><tspan
+               sodipodi:role="line"
+               id="tspan2492"
+               x="232.85715"
+               y="99.505043">Rect</tspan></text>
+        </g>
+      </g>
     </g>
   </g>
   <g
--- a/examples/dynamic/main.c	Sat Dec 13 07:42:01 2008 +0800
+++ b/examples/dynamic/main.c	Sat Dec 13 17:13:31 2008 +0800
@@ -6,6 +6,7 @@
  */
 #include <stdio.h>
 #include <mb.h>
+#include <string.h>
 #include "menu.h"
 #include "button.h"
 
@@ -23,6 +24,120 @@
     shape_t *rect;
     co_aix rx,ry;
 };
+
+
+typedef struct _mb_button {
+    engine_t *en;
+    coord_t *root;
+    coord_t *active;
+    coord_t *normal;
+    coord_t *click;
+    void (*press)();
+    void *arg;
+} mb_button_t;
+
+
+#define COORD_SHOW(group) coord_show(group);rdman_coord_changed(en->rdman, group)
+#define COORD_HIDE(group) coord_hide(group);rdman_coord_changed(en->rdman, group)
+
+#define CMOUSE(e) (coord_get_mouse_event(e))
+
+
+
+static void mb_button_move(event_t *evt, void *arg) 
+{
+    mb_button_t *btn = (mb_button_t *) arg;
+    engine_t *en = btn->en;
+
+    
+    printf("Mouse move\n");
+    COORD_SHOW(btn->active);
+    rdman_coord_changed(btn->en->rdman,btn->root);
+    rdman_redraw_changed(btn->en->rdman);
+}
+static void mb_button_out(event_t *evt, void *arg) 
+{
+    mb_button_t *btn = (mb_button_t *) arg;
+    engine_t *en = btn->en;
+
+    printf("mouse out\n");
+    COORD_HIDE(btn->active);
+    rdman_coord_changed(btn->en->rdman,btn->root);
+    rdman_redraw_changed(btn->en->rdman);
+}
+
+void mb_button_show_active(const mb_timeval_t *tmo, const mb_timeval_t *now, void *arg)
+{
+    mb_button_t *btn = (mb_button_t *) arg;
+    engine_t *en = btn->en;
+
+    COORD_HIDE(btn->click);
+    rdman_coord_changed(btn->en->rdman,btn->root);
+    rdman_redraw_changed(btn->en->rdman);
+}
+
+void mb_button_pressed(event_t *evt, void *arg)
+{
+    mb_button_t *btn = (mb_button_t *) arg;
+    engine_t *en = btn->en;
+    mb_timeval_t now,to;
+
+    printf("Pressed\n");
+    COORD_SHOW(btn->click);
+    rdman_coord_changed(en->rdman,en->button->root_coord);
+    rdman_redraw_changed(en->rdman);
+    get_now(&now);
+    MB_TIMEVAL_SET(&to, 0, 500);
+    MB_TIMEVAL_ADD(&to,&now);
+
+    mb_tman_timeout(X_MB_tman(btn->en->rt), &to, mb_button_show_active, arg);
+}
+mb_button_t *mb_button_new(engine_t *en,mb_sprite_t *sp, char *name)
+{
+    mb_button_t *btn = (mb_button_t *) malloc(sizeof(mb_button_t));
+    char *buf = (char *) malloc(strlen(name)+5);
+
+    btn->root = (coord_t *) MB_SPRITE_GET_OBJ(sp, name);
+    sprintf(buf, "%s_normal", name);
+    btn->normal = (coord_t *) MB_SPRITE_GET_OBJ(sp, buf);
+    if (btn->normal == NULL) {
+    	printf("Missing normal button, this is not a correct button\n");
+    }
+    sprintf(buf, "%s_active", name);
+    btn->active = (coord_t *) MB_SPRITE_GET_OBJ(sp, buf);
+    if (btn->active == NULL) {
+    	printf("Missing active button, this is not a correct button\n");
+    }
+    sprintf(buf, "%s_click", name);
+    btn->click = (coord_t *) MB_SPRITE_GET_OBJ(sp, buf);
+    if (btn->click == NULL) {
+    	printf("Missing click button, this is not a correct button\n");
+    }
+    btn->press = NULL;
+    // Show only the normal button
+    COORD_HIDE(btn->active);
+    COORD_HIDE(btn->click);
+    // Move to the same position
+    btn->active->matrix[2] = 200;
+    btn->active->matrix[5] = 200;
+    btn->normal->matrix[2] = 200;
+    btn->normal->matrix[5] = 200;
+    btn->click->matrix[2] = 200;
+    btn->click->matrix[5] = 200;
+    btn->en = en;
+    subject_add_event_observer(CMOUSE(btn->root), EVT_MOUSE_MOVE, mb_button_move,btn);
+    subject_add_event_observer(CMOUSE(btn->root), EVT_MOUSE_OUT, mb_button_out,btn);
+    subject_add_event_observer(CMOUSE(btn->root), EVT_MOUSE_BUT_RELEASE, mb_button_pressed,btn);
+    return btn;
+}
+
+
+void mb_button_add_onClick(mb_button_t *b, void (*h)(void *arg), void *arg)
+{
+    b->press = h;
+    b->arg = arg;
+}
+
 engine_t *engine_init()
 {
 
@@ -50,51 +165,7 @@
     X_MB_free(en->rt);
     free(en);
 }
-#define COORD_SHOW(group) coord_show(group);rdman_coord_changed(en->rdman, group)
-#define COORD_HIDE(group) coord_hide(group);rdman_coord_changed(en->rdman, group)
 
-#define CMOUSE(e) (coord_get_mouse_event(e))
-
-
-
-static void button_move(event_t *evt, void *arg) 
-{
-    engine_t *en = (engine_t *) arg;
-
-    
-    printf("Mouse move\n");
-    COORD_SHOW(en->button->active);
-    rdman_coord_changed(en->rdman,en->button->root_coord);
-    rdman_redraw_changed(en->rdman);
-}
-static void button_out(event_t *evt, void *arg) 
-{
-    engine_t *en = (engine_t *) arg;
-
-    printf("mouse out\n");
-    COORD_HIDE(en->button->active);
-    rdman_coord_changed(en->rdman,en->button->root_coord);
-    rdman_redraw_changed(en->rdman);
-}
-
-void button_pressed(event_t *evt, void *arg)
-{
-	printf("Pressed\n");
-}
-
-void engine_add_button(engine_t *en, coord_t *normal, coord_t *active, void (*func)())
-{
-    active->matrix[2] = 200;
-    active->matrix[5] = 200;
-    normal->matrix[2] = 200;
-    normal->matrix[5] = 200;
-    COORD_HIDE(en->button->active);
-    rdman_coord_changed(en->rdman,en->button->root_coord);
-    rdman_redraw_changed(en->rdman);
-    subject_add_event_observer(CMOUSE(normal), EVT_MOUSE_MOVE, button_move,en);
-    subject_add_event_observer(CMOUSE(active), EVT_MOUSE_OUT, button_out,en);
-    subject_add_event_observer(CMOUSE(active), EVT_MOUSE_BUT_RELEASE, button_pressed,en);
-}
 
 
 void coord_move(coord_t *c, co_aix x, co_aix y)
@@ -171,17 +242,22 @@
 }
 
 
-
+void test(void *a)
+{
+    printf("Button is pressed.....\n");
+}
 
 
 int main(int argc, char * const argv[]) {
     subject_t *subject;
     engine_t *en;
+    mb_button_t *b;
 
     en = engine_init();
     en->menu = menu_new(en->rdman, en->rdman->root_coord);
     en->button = button_new(en->rdman, en->rdman->root_coord);
-    engine_add_button(en, en->button->normal, en->button->active, button_pressed);
+    b = mb_button_new(en, (mb_sprite_t *) en->button, "btn");
+    mb_button_add_onClick(b, test,NULL);
 
     en->rx = 0;
     en->ry = 0;