Added basic touchscreen

diff --git a/minimenu/TODO.txt b/minimenu/TODO.txt
index 0c826de..7566890 100644 (file)
--- a/minimenu/TODO.txt
+++ b/minimenu/TODO.txt
@@ -14,15 +14,9 @@
 - deploy..
   - .desktop for deployment, for running from xfce
 
 - deploy..
   - .desktop for deployment, for running from xfce
 

-- touchscreen
-  - launch apps
-  - pick/rotate category
-
-- honor render_mask to know what to update
-- figure out why deferred preview pics blow up
-- handle SD eject/insert
-

 - future
 - future

+  - honor render_mask to know what to update
+  - handle SD eject/insert? or leave on manual

   - defer icon load?
   - add callback to pnd_disco_Search (maybe new func to not break cpas code), so can show number apps found so far
   - note taking field
   - defer icon load?
   - add callback to pnd_disco_Search (maybe new func to not break cpas code), so can show number apps found so far
   - note taking field

diff --git a/minimenu/mmui.c b/minimenu/mmui.c
index abc4ef4..e9aff4d 100644 (file)
--- a/minimenu/mmui.c
+++ b/minimenu/mmui.c
@@ -293,6 +293,9 @@ void ui_render ( unsigned int render_mask ) {
   }
 #endif
 
   }
 #endif
 

+  // reset touchscreen regions
+  ui_register_reset();
+

   // ensure selection is visible
   if ( ui_selected ) {
 
   // ensure selection is visible
   if ( ui_selected ) {
 


@@ -323,7 +326,6 @@ void ui_render ( unsigned int render_mask ) {
     dest -> w = sdl_realscreen -> w;
     dest -> h = sdl_realscreen -> h;
     SDL_BlitSurface ( g_imagecache [ IMG_BACKGROUND_800480 ].i, NULL /* whole image */, sdl_realscreen, dest /* 0,0 */ );
     dest -> w = sdl_realscreen -> w;
     dest -> h = sdl_realscreen -> h;
     SDL_BlitSurface ( g_imagecache [ IMG_BACKGROUND_800480 ].i, NULL /* whole image */, sdl_realscreen, dest /* 0,0 */ );

-    //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

     dest++;
   }
 
     dest++;
   }
 


@@ -334,7 +336,6 @@ void ui_render ( unsigned int render_mask ) {
     dest -> w = sdl_realscreen -> w;
     dest -> h = sdl_realscreen -> h;
     SDL_BlitSurface ( g_imagecache [ IMG_BACKGROUND_TABMASK ].i, NULL /* whole image */, sdl_realscreen, dest /* 0,0 */ );
     dest -> w = sdl_realscreen -> w;
     dest -> h = sdl_realscreen -> h;
     SDL_BlitSurface ( g_imagecache [ IMG_BACKGROUND_TABMASK ].i, NULL /* whole image */, sdl_realscreen, dest /* 0,0 */ );

-    //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

     dest++;
   }
 
     dest++;
   }
 


@@ -371,7 +372,10 @@ void ui_render ( unsigned int render_mask ) {
       dest -> y = tab_offset_y;
       //pnd_log ( pndn_debug, "tab %u at %ux%u\n", col, dest.x, dest.y );
       SDL_BlitSurface ( s, &src, sdl_realscreen, dest );
       dest -> y = tab_offset_y;
       //pnd_log ( pndn_debug, "tab %u at %ux%u\n", col, dest.x, dest.y );
       SDL_BlitSurface ( s, &src, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );
+
+      // store touch info
+      ui_register_tab ( col, dest -> x, dest -> y, tab_width, tab_height );
+

       dest++;
 
       // draw text
       dest++;
 
       // draw text


@@ -401,7 +405,6 @@ void ui_render ( unsigned int render_mask ) {
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_up_x", 450 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_up_y", 80 );
       SDL_BlitSurface ( g_imagecache [ IMG_ARROW_UP ].i, NULL /* whole image */, sdl_realscreen, dest );
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_up_x", 450 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_up_y", 80 );
       SDL_BlitSurface ( g_imagecache [ IMG_ARROW_UP ].i, NULL /* whole image */, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

       dest++;
 
       show_bar = 1;
       dest++;
 
       show_bar = 1;


@@ -412,7 +415,6 @@ void ui_render ( unsigned int render_mask ) {
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_down_x", 450 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_down_y", 80 );
       SDL_BlitSurface ( g_imagecache [ IMG_ARROW_DOWN ].i, NULL /* whole image */, sdl_realscreen, dest );
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_down_x", 450 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_down_y", 80 );
       SDL_BlitSurface ( g_imagecache [ IMG_ARROW_DOWN ].i, NULL /* whole image */, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

       dest++;
 
       show_bar = 1;
       dest++;
 
       show_bar = 1;


@@ -427,7 +429,6 @@ void ui_render ( unsigned int render_mask ) {
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_bar_x", 450 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_bar_y", 100 );
       SDL_BlitSurface ( g_imagecache [ IMG_ARROW_SCROLLBAR ].i, &src /* whole image */, sdl_realscreen, dest );
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_bar_x", 450 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "grid.arrow_bar_y", 100 );
       SDL_BlitSurface ( g_imagecache [ IMG_ARROW_SCROLLBAR ].i, &src /* whole image */, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

       dest++;
     } // bar
 
       dest++;
     } // bar
 


@@ -444,7 +445,6 @@ void ui_render ( unsigned int render_mask ) {
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_x", 460 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_y", 60 );
       SDL_BlitSurface ( g_imagecache [ IMG_DETAIL_BG ].i, &src, sdl_realscreen, dest );
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_x", 460 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_y", 60 );
       SDL_BlitSurface ( g_imagecache [ IMG_DETAIL_BG ].i, &src, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

       dest++;
     }
 
       dest++;
     }
 


@@ -453,7 +453,6 @@ void ui_render ( unsigned int render_mask ) {
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_x", 460 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_y", 60 );
       SDL_BlitSurface ( g_imagecache [ IMG_DETAIL_PANEL ].i, NULL /* whole image */, sdl_realscreen, dest );
       dest -> x = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_x", 460 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "detailpane.pane_offset_y", 60 );
       SDL_BlitSurface ( g_imagecache [ IMG_DETAIL_PANEL ].i, NULL /* whole image */, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

       dest++;
     }
 
       dest++;
     }
 


@@ -480,13 +479,11 @@ void ui_render ( unsigned int render_mask ) {
            dest -> x = grid_offset_x + ( col * cell_width ) + icon_offset_x;
            dest -> y = grid_offset_y + ( displayrow * cell_height ) + icon_offset_y;
            SDL_BlitSurface ( g_imagecache [ IMG_SELECTED_ALPHAMASK ].i, NULL /* all */, sdl_realscreen, dest );
            dest -> x = grid_offset_x + ( col * cell_width ) + icon_offset_x;
            dest -> y = grid_offset_y + ( displayrow * cell_height ) + icon_offset_y;
            SDL_BlitSurface ( g_imagecache [ IMG_SELECTED_ALPHAMASK ].i, NULL /* all */, sdl_realscreen, dest );

-           //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

            dest++;
            // text
            dest -> x = grid_offset_x + ( col * cell_width ) + text_clip_x;
            dest -> y = grid_offset_y + ( displayrow * cell_height ) + pnd_conf_get_as_int ( g_conf, "grid.text_hilite_offset_y" );
            SDL_BlitSurface ( g_imagecache [ IMG_SELECTED_HILITE ].i, NULL /* all */, sdl_realscreen, dest );
            dest++;
            // text
            dest -> x = grid_offset_x + ( col * cell_width ) + text_clip_x;
            dest -> y = grid_offset_y + ( displayrow * cell_height ) + pnd_conf_get_as_int ( g_conf, "grid.text_hilite_offset_y" );
            SDL_BlitSurface ( g_imagecache [ IMG_SELECTED_HILITE ].i, NULL /* all */, sdl_realscreen, dest );

-           //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

            dest++;
          } // selected?
 
            dest++;
          } // selected?
 


@@ -510,7 +507,10 @@ void ui_render ( unsigned int render_mask ) {
            dest -> y = grid_offset_y + ( displayrow * cell_height ) + icon_offset_y;
 
            SDL_BlitSurface ( iconsurface, &src, sdl_realscreen, dest );
            dest -> y = grid_offset_y + ( displayrow * cell_height ) + icon_offset_y;
 
            SDL_BlitSurface ( iconsurface, &src, sdl_realscreen, dest );

-           //SDL_UpdateRects ( sdl_realscreen, 1, &dest );
+
+           // store touch info
+           ui_register_app ( appiter, dest -> x, dest -> y, src.w, src.h );
+

            dest++;
 
          }
            dest++;
 
          }


@@ -663,7 +663,6 @@ void ui_render ( unsigned int render_mask ) {
        ( ( pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_width", 50 ) - previewpic -> w ) / 2 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_offset_y", 50 );
       SDL_BlitSurface ( previewpic, NULL /* whole image */, sdl_realscreen, dest );
        ( ( pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_width", 50 ) - previewpic -> w ) / 2 );
       dest -> y = pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_offset_y", 50 );
       SDL_BlitSurface ( previewpic, NULL /* whole image */, sdl_realscreen, dest );

-      //SDL_UpdateRects ( sdl_realscreen, 1, &dest );

       dest++;
     }
 
       dest++;
     }
 


@@ -954,18 +953,19 @@ void ui_process_input ( unsigned char block_p ) {
       break;
 #endif
 
       break;
 #endif
 

-#if 0 // mouse / touchscreen
+#if 1 // mouse / touchscreen
+#if 0

     case SDL_MOUSEBUTTONDOWN:
       if ( event.button.button == SDL_BUTTON_LEFT ) {
        cb_pointer_press ( gc, event.button.x / g_scale, event.button.y / g_scale );
        ui_event++;
       }
       break;
     case SDL_MOUSEBUTTONDOWN:
       if ( event.button.button == SDL_BUTTON_LEFT ) {
        cb_pointer_press ( gc, event.button.x / g_scale, event.button.y / g_scale );
        ui_event++;
       }
       break;

+#endif

 
     case SDL_MOUSEBUTTONUP:
       if ( event.button.button == SDL_BUTTON_LEFT ) {
 
     case SDL_MOUSEBUTTONUP:
       if ( event.button.button == SDL_BUTTON_LEFT ) {

-       cb_pointer_release ( gc, event.button.x / g_scale, event.button.y / g_scale );
-       retval |= STAT_pen;
+       ui_touch_act ( event.button.x, event.button.y );

        ui_event++;
       }
       break;
        ui_event++;
       }
       break;


@@ -1709,3 +1709,80 @@ unsigned char ui_show_info ( char *pndrun, pnd_disco_t *p ) {
 
   return ( 1 );
 }
 
   return ( 1 );
 }

+
+typedef struct {
+  SDL_Rect r;
+  int catnum;
+  mm_appref_t *ref;
+} ui_touch_t;
+#define MAXTOUCH 100
+ui_touch_t ui_touchrects [ MAXTOUCH ];
+unsigned char ui_touchrect_count = 0;
+
+void ui_register_reset ( void ) {
+  bzero ( ui_touchrects, sizeof(ui_touch_t)*MAXTOUCH );
+  ui_touchrect_count = 0;
+  return;
+}
+
+void ui_register_tab ( unsigned char catnum, unsigned int x, unsigned int y, unsigned int w, unsigned int h ) {
+
+  if ( ui_touchrect_count == MAXTOUCH ) {
+    return;
+  }
+
+  ui_touchrects [ ui_touchrect_count ].r.x = x;
+  ui_touchrects [ ui_touchrect_count ].r.y = y;
+  ui_touchrects [ ui_touchrect_count ].r.w = w;
+  ui_touchrects [ ui_touchrect_count ].r.h = h;
+  ui_touchrects [ ui_touchrect_count ].catnum = catnum;
+  ui_touchrect_count++;
+
+  return;
+}
+
+void ui_register_app ( mm_appref_t *app, unsigned int x, unsigned int y, unsigned int w, unsigned int h ) {
+
+  if ( ui_touchrect_count == MAXTOUCH ) {
+    return;
+  }
+
+  ui_touchrects [ ui_touchrect_count ].r.x = x;
+  ui_touchrects [ ui_touchrect_count ].r.y = y;
+  ui_touchrects [ ui_touchrect_count ].r.w = w;
+  ui_touchrects [ ui_touchrect_count ].r.h = h;
+  ui_touchrects [ ui_touchrect_count ].ref = app;
+  ui_touchrect_count++;
+
+  return;
+}
+
+void ui_touch_act ( unsigned int x, unsigned int y ) {
+
+  unsigned char i;
+  ui_touch_t *t;
+
+  for ( i = 0; i < ui_touchrect_count; i++ ) {
+    t = &(ui_touchrects [ i ]);
+
+    if ( x >= t -> r.x &&
+        x <= t -> r.x + t -> r.w &&
+        y >= t -> r.y &&
+        y <= t -> r.y + t -> r.h
+       )
+    {
+
+      if ( t -> ref ) {
+       ui_selected = t -> ref;
+       ui_push_exec();
+      } else {
+       ui_category = t -> catnum;
+      }
+
+      break;
+    }
+
+  } // for
+
+  return;
+}

diff --git a/minimenu/mmui.h b/minimenu/mmui.h
index 95e44fc..0ac17ff 100644 (file)
--- a/minimenu/mmui.h
+++ b/minimenu/mmui.h
@@ -87,8 +87,9 @@ unsigned char ui_show_info ( char *pndrun, pnd_disco_t *p );
 
 // ui_render() can register tappable-areas which touchscreen code can then figure out if we made a hit
 void ui_register_reset ( void );
 
 // ui_render() can register tappable-areas which touchscreen code can then figure out if we made a hit
 void ui_register_reset ( void );

-void ui_register_tab ( mm_category_t *category, unsigned int x, unsigned int y, unsigned int w, unsigned int h );
-void ui_register_app ( pnd_disco_t *app, unsigned int x, unsigned int y, unsigned int w, unsigned int h );
+void ui_register_tab ( unsigned char catnum, unsigned int x, unsigned int y, unsigned int w, unsigned int h );
+void ui_register_app ( mm_appref_t *app, unsigned int x, unsigned int y, unsigned int w, unsigned int h );
+void ui_touch_act ( unsigned int x, unsigned int y );

 
 // deferred preview timer
 void ui_set_selected ( mm_appref_t *r );
 
 // deferred preview timer
 void ui_set_selected ( mm_appref_t *r );