Touch input changes

* Add option to change button's colors
* Add "checked" state for button
* Make tab switch buttons on top real buttons
* Fix touch issues with listview and buttons

Author: Tasssadar

button.c

@@ -8,11 +8,28 @@ void button_init_ui(button *b, const char *text, int size)
 {
     b->touch_id = -1;
 
-    b->rect = fb_add_rect(b->x, b->y, b->w, b->h, LBLUE);
-
-    int text_x = center_x(b->x, b->w, size, text);
-    int text_y = center_y(b->y, b->h, size);
-    b->text = fb_add_text(text_x, text_y, WHITE, size, text);
+    if(text != NULL)
+    {
+        b->c[CLR_NORMAL][0] = LBLUE;
+        b->c[CLR_NORMAL][1] = WHITE;
+        b->c[CLR_HOVER][0] = LBLUE2;
+        b->c[CLR_HOVER][1] = WHITE;
+        b->c[CLR_DIS][0] = GRAY;
+        b->c[CLR_DIS][1] = WHITE;
+        b->c[CLR_CHECK][0] = LBLUE2;
+        b->c[CLR_CHECK][1] = WHITE;
+
+        b->rect = fb_add_rect(b->x, b->y, b->w, b->h, b->c[CLR_NORMAL][0]);
+
+        int text_x = center_x(b->x, b->w, size, text);
+        int text_y = center_y(b->y, b->h, size);
+        b->text = fb_add_text(text_x, text_y, b->c[CLR_NORMAL][1], size, text);
+    }
+    else
+    {
+        b->text = NULL;
+        b->rect = NULL;
+    }
 
     add_touch_handler(&button_touch_handler, b);
 }
@@ -21,8 +38,11 @@ void button_destroy(button *b)
 {
     rm_touch_handler(&button_touch_handler, b);
 
-    fb_rm_rect(b->rect);
-    fb_rm_text(b->text);
+    if(b->text)
+    {
+        fb_rm_rect(b->rect);
+        fb_rm_text(b->text);
+    }
 
     free(b);
 }
@@ -32,48 +52,44 @@ void button_move(button *b, int x, int y)
     b->x = x;
     b->y = y;
 
-    b->rect->head.x = x;
-    b->rect->head.y = y;
+    if(b->text)
+    {
+        b->rect->head.x = x;
+        b->rect->head.y = y;
 
-    b->text->head.x = center_x(x, b->w, b->text->size, b->text->text);
-    b->text->head.y = center_y(y, b->h, b->text->size);
+        b->text->head.x = center_x(x, b->w, b->text->size, b->text->text);
+        b->text->head.y = center_y(y, b->h, b->text->size);
+    }
 }
 
 void button_set_hover(button *b, int hover)
 {
-    if(!( ((b->flags & BTN_HOVER) != 0) ^ (hover == 1) ))
+    if((hover == 1) == ((b->flags & BTN_HOVER) != 0))
         return;
 
     if(hover)
-    {
         b->flags |= BTN_HOVER;
-        b->rect->color = LBLUE2;
-    }
     else
-    {
         b->flags &= ~(BTN_HOVER);
-        b->rect->color = LBLUE;
-    }
 
+    button_update_colors(b);
     fb_draw();
 }
 
 void button_enable(button *b, int enable)
 {
-    if(!( ((b->flags & BTN_DISABLED) == 0) ^ (enable == 1) ))
+    if((enable == 1) == ((b->flags & BTN_DISABLED) == 0))
         return;
 
     if(enable)
-    {
         b->flags &= ~(BTN_DISABLED);
-        b->rect->color = LBLUE;
-    }
     else
     {
         b->flags |= BTN_DISABLED;
         b->flags &= ~(BTN_HOVER);
-        b->rect->color = GRAY;
     }
+
+    button_update_colors(b);
     fb_draw();
 }
 
@@ -84,7 +100,7 @@ int button_touch_handler(touch_event *ev, void *data)
     if(b->flags & BTN_DISABLED)
         return -1;
 
-    if(b->touch_id == -1)
+    if(b->touch_id == -1 && (ev->changed & TCHNG_ADDED))
     {
         if(!in_rect(ev->x, ev->y, b->x, b->y, b->w, b->h))
             return -1;
@@ -107,3 +123,40 @@ int button_touch_handler(touch_event *ev, void *data)
 
     return 0;
 }
+
+void button_set_color(button *b, int idx, int text, uint32_t color)
+{
+    b->c[idx][text] = color;
+    button_update_colors(b);
+}
+
+void button_update_colors(button *b)
+{
+    int state = CLR_NORMAL;
+    if(b->flags & BTN_DISABLED)
+        state = CLR_DIS;
+    else if(b->flags & BTN_HOVER)
+        state = CLR_HOVER;
+    else if(b->flags & BTN_CHECKED)
+        state = CLR_CHECK;
+
+    if(b->text)
+    {
+        b->rect->color = b->c[state][0];
+        b->text->color = b->c[state][1];
+    }
+}
+
+void button_set_checked(button *b, int checked)
+{
+    if((checked == 1) == ((b->flags & BTN_CHECKED) != 0))
+        return;
+
+    if(checked)
+        b->flags |= BTN_CHECKED;
+    else
+        b->flags &= ~(BTN_CHECKED);
+
+    button_update_colors(b);
+    fb_draw();
+}

button.h

@@ -7,7 +7,18 @@
 enum 
 {
     BTN_HOVER         = 0x01,
-    BTN_DISABLED      = 0x02
+    BTN_DISABLED      = 0x02,
+    BTN_CHECKED       = 0x04,
+};
+
+enum
+{
+    CLR_NORMAL        = 0,
+    CLR_HOVER,
+    CLR_DIS,
+    CLR_CHECK,
+
+    CLR_MAX
 };
 
 typedef struct
@@ -16,6 +27,8 @@ typedef struct
     int w, h;
     fb_text *text;
     fb_rect *rect;
+
+    uint32_t c[CLR_MAX][2];
 
     int flags;
     int touch_id;
@@ -29,6 +42,9 @@ void button_destroy(button *b);
 void button_move(button *b, int x, int y);
 void button_set_hover(button *b, int hover);
 void button_enable(button *b, int enable);
+void button_set_checked(button *b, int checked);
+void button_set_color(button *b, int idx, int text, uint32_t color);
+void button_update_colors(button *b);
 int button_touch_handler(touch_event *ev, void *data);
 
 #endif

checkbox.c

@@ -98,7 +98,7 @@ int checkbox_touch_handler(touch_event *ev, void *data)
 {
     checkbox *box = (checkbox*)data;
 
-    if(box->touch_id == -1)
+    if(box->touch_id == -1 && (ev->changed & TCHNG_ADDED))
     {
         if(!in_rect(ev->x, ev->y, box->x-TOUCH, box->y-TOUCH, CHECKBOX_SIZE+TOUCH*2, CHECKBOX_SIZE+TOUCH*2))
             return -1;

input.c

@@ -203,6 +203,7 @@ static void handle_touch_event(struct input_event *ev)
             if(!mt_events[i].changed)
                 continue;
 
+            ERROR("Ev %d 0x%X\n", mt_events[i].id, mt_events[i].changed);
             it = mt_handlers;
             while(it)
             {

listview.c

@@ -119,7 +119,7 @@ void listview_update_scroll_mark(listview *view)
 int listview_touch_handler(touch_event *ev, void *data)
 {
     listview *view = (listview*)data;
-    if(view->touch.id == -1)
+    if(view->touch.id == -1 && (ev->changed & TCHNG_ADDED))
     {
         if (ev->x < view->x || ev->y < view->y ||
             ev->x > view->x+view->w || ev->y > view->y+view->h)

multirom_ui.c

@@ -23,6 +23,7 @@
 
 static fb_text *tab_texts[TAB_COUNT] = { 0 };
 static fb_rect *selected_tab_rect = NULL;
+static button *tab_btns[TAB_COUNT] = { NULL };
 static int selected_tab = -1;
 static void *tab_data = NULL;
 static struct multirom_status *mrom_status = NULL;
@@ -31,8 +32,7 @@ static volatile int exit_ui_code = -1;
 static fb_msgbox *active_msgbox = NULL;
 static volatile int update_usb_roms = 0;
 static volatile int start_pong = 0;
-static int pong_btn_w = 0;
-static int pong_btn_h = 0;
+static button *pong_btn = NULL;
 
 static pthread_mutex_t exit_code_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -148,6 +148,16 @@ int multirom_ui(struct multirom_status *s, struct multirom_rom **to_boot)
     fb_draw();
     fb_freeze(1);
 
+    button_destroy(pong_btn);
+    free(pong_btn);
+
+    int i;
+    for(i = 0; i < TAB_COUNT; ++i)
+    {
+        button_destroy(tab_btns[i]);
+        free(tab_btns[i]);
+    }
+
     stop_input_thread();
 
     multirom_ui_destroy_tab(selected_tab);
@@ -167,8 +177,12 @@ void multirom_ui_init_header(void)
     text_x = center_x(0, x, SIZE_EXTRA, str[3]);
     fb_add_text(text_x, 5, WHITE, SIZE_EXTRA, str[3]);
 
-    pong_btn_w = x;
-    pong_btn_h = HEADER_HEIGHT;
+    pong_btn = malloc(sizeof(button));
+    memset(pong_btn, 0, sizeof(button));
+    pong_btn->w = x;
+    pong_btn->h = HEADER_HEIGHT;
+    pong_btn->clicked = &multirom_ui_start_pong;
+    button_init_ui(pong_btn, NULL, 0);
 
     for(i = 0; i < TAB_COUNT; ++i)
     {
@@ -178,6 +192,15 @@ void multirom_ui_init_header(void)
 
         fb_add_rect(x, 0, 2, HEADER_HEIGHT, WHITE);
 
+        tab_btns[i] = malloc(sizeof(button));
+        memset(tab_btns[i], 0, sizeof(button));
+        tab_btns[i]->x = x;
+        tab_btns[i]->w = TAB_BTN_WIDTH;
+        tab_btns[i]->h = HEADER_HEIGHT;
+        tab_btns[i]->action = i;
+        tab_btns[i]->clicked = &multirom_ui_switch;
+        button_init_ui(tab_btns[i], NULL, 0);
+
         x += TAB_BTN_WIDTH;
     }
 
@@ -298,31 +321,9 @@ int multirom_ui_touch_handler(touch_event *ev, void *data)
         }
     }
 
-    if(!(ev->changed & TCHNG_REMOVED))
-        return -1;
-
-    if(ev->x < pong_btn_w && ev->y < pong_btn_h)
-        start_pong = 1;
-
-    if(touch_count > 0)
+    if((ev->changed & TCHNG_REMOVED) && touch_count > 0)
         --touch_count;
 
-    int x = fb_width - (TAB_BTN_WIDTH*TAB_COUNT);
-    if(ev->y > HEADER_HEIGHT || ev->x < x)
-        return -1;
-
-    int i, nextx;
-    for(i = 0; i < TAB_COUNT; ++i)
-    {
-        nextx = x + TAB_BTN_WIDTH;
-        if(ev->x > x && ev->x < nextx)
-        {
-            multirom_ui_switch(i);
-            return 0;
-        }
-        x = nextx;
-    }
-
     return -1;
 }
 
@@ -382,6 +383,11 @@ void multirom_ui_refresh_usb_handler(void)
     pthread_mutex_unlock(&exit_code_mutex);
 }
 
+void multirom_ui_start_pong(int action)
+{
+    start_pong = 1;
+}
+
 #define ROMS_FOOTER_H 130
 #define ROMS_HEADER_H 90
 

multirom_ui.h

@@ -32,6 +32,7 @@ void multirom_ui_switch(int tab);
 void multirom_ui_fill_rom_list(listview *view, int mask);
 void multirom_ui_auto_boot(void);
 void multirom_ui_refresh_usb_handler(void);
+void multirom_ui_start_pong(int action);
 
 void *multirom_ui_tab_rom_init(int tab_type);
 void multirom_ui_tab_rom_destroy(void *data);