Add Touch Support

SiegeLord · Feb 26, 2012 · 139f467 · 139f467
1 parent 4d23504
commit 139f467
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 0 deletions.
diff --git a/example/example.c b/example/example.c
@@ -67,6 +67,8 @@ int main(int argc, char *argv[])
 	queue = al_create_event_queue();
 	al_register_event_source(queue, al_get_keyboard_event_source());
 	al_register_event_source(queue, al_get_mouse_event_source());
+    if (al_install_touch_input())
+        al_register_event_source(queue, al_get_touch_input_event_source());
 
 	refresh_rate = 60;
 	fixed_dt = 1.0f / refresh_rate;

diff --git a/src/widgets/box.c b/src/widgets/box.c
@@ -47,6 +47,15 @@ int wz_box_proc(WZ_WIDGET* wgt, ALLEGRO_EVENT* event)
 			ret = 0;
 			break;
 		}
+        case ALLEGRO_EVENT_TOUCH_BEGIN:
+        {
+			if (wz_widget_rect_test(wgt, event->touch.x, event->touch.y))
+			{
+				wz_ask_parent_for_focus(wgt);
+			}
+			ret = 0;
+			break;            
+        }
 		case WZ_DRAW:
 		{
 			if (wgt->flags & WZ_STATE_HIDDEN)

diff --git a/src/widgets/button.c b/src/widgets/button.c
@@ -183,6 +183,25 @@ int wz_button_proc(WZ_WIDGET* wgt, ALLEGRO_EVENT* event)
 			}
 			break;
 		}
+        case ALLEGRO_EVENT_TOUCH_BEGIN:
+		{
+			if (wgt->flags & WZ_STATE_DISABLED)
+			{
+				ret = 0;
+			}
+			else if ((event->touch.x != 0 || event->touch.y != 0) && wz_widget_rect_test(wgt, event->touch.x, event->touch.y))
+			{
+                but->down = 1;
+				wz_ask_parent_for_focus(wgt);
+                wz_trigger(wgt);
+			}
+			else
+			{
+				but->down = 0;
+				ret = 0;
+			}
+			break;
+		}
 		case WZ_DESTROY:
 		{
 			if(but->own)

diff --git a/src/widgets/editbox.c b/src/widgets/editbox.c
@@ -131,6 +131,26 @@ int wz_editbox_proc(WZ_WIDGET* wgt, ALLEGRO_EVENT* event)
 				ret = 0;
 			break;
 		}
+        case ALLEGRO_EVENT_TOUCH_BEGIN:
+        {
+            if (wgt->flags & WZ_STATE_DISABLED)
+			{
+				ret = 0;
+			}
+			else if (wz_widget_rect_test(wgt, event->touch.x, event->touch.y))
+			{
+				int len = al_ustr_length(box->text);
+				ALLEGRO_USTR_INFO info;
+				ALLEGRO_USTR* text = al_ref_ustr(&info, box->text, box->scroll_pos, len - 1);
+
+				ALLEGRO_FONT* font = wgt->theme->get_font(wgt->theme, 0);
+				wz_ask_parent_for_focus(wgt);
+				box->cursor_pos = wz_get_text_pos(font, text, event->touch.x - wgt->x) + box->scroll_pos;
+			}
+			else
+				ret = 0;
+			break;
+        }
 		case WZ_HANDLE_SHORTCUT:
 		{
 			wz_ask_parent_for_focus(wgt);

diff --git a/src/widgets/scroll.c b/src/widgets/scroll.c
@@ -138,6 +138,39 @@ int wz_scroll_proc(WZ_WIDGET* wgt, ALLEGRO_EVENT* event)
 				ret = 0;
 			break;
 		}
+        case ALLEGRO_EVENT_TOUCH_BEGIN:
+        {
+			int button_down = 1;
+			if (wgt->flags & WZ_STATE_DISABLED)
+			{
+				ret = 0;
+			}
+			else if(wz_widget_rect_test(wgt, event->touch.x, event->touch.y))
+			{
+				wz_ask_parent_for_focus(wgt);
+				if(button_down == 1)
+				{
+					float fraction;
+					int old_pos;
+
+					if (vertical)
+						fraction = ((float)(event->touch.y - wgt->y)) / ((float)wgt->h);
+					else
+						fraction = ((float)(event->touch.x - wgt->x)) / ((float)wgt->w);
+
+					old_pos = scl->cur_pos;
+					scl->cur_pos = (int)(((float)scl->max_pos) * fraction + 0.5f);
+					if (old_pos != scl->cur_pos)
+					{
+						wz_trigger(wgt);
+					}
+				}
+			}
+			else
+				ret = 0;
+			break;
+
+        }
 		case ALLEGRO_EVENT_KEY_CHAR:
 		{
 			int old_pos = scl->cur_pos;;

diff --git a/src/widgets/toggle.c b/src/widgets/toggle.c
@@ -102,6 +102,20 @@ int wz_toggle_button_proc(WZ_WIDGET* wgt, ALLEGRO_EVENT* event)
 			return wz_widget_proc(wgt, event);
 			break;
 		}
+        case ALLEGRO_EVENT_TOUCH_BEGIN:
+		{
+			if (wgt->flags & WZ_STATE_DISABLED)
+			{
+				ret = 0;
+			}
+			if (wz_widget_rect_test(wgt, event->touch.x, event->touch.y))
+			{
+                wz_trigger(wgt);
+				wz_ask_parent_for_focus(wgt);
+			}
+			return wz_widget_proc(wgt, event);
+			break;
+		}
 		case ALLEGRO_EVENT_KEY_UP:
 		case ALLEGRO_EVENT_MOUSE_BUTTON_UP:
 		{

diff --git a/src/widgets/widget.c b/src/widgets/widget.c
@@ -136,6 +136,24 @@ int wz_widget_proc(WZ_WIDGET* wgt, ALLEGRO_EVENT* event)
 			}
 			break;
 		}
+        /* Switch through elements on Touch:
+        case ALLEGRO_EVENT_TOUCH_BEGIN:
+		{
+			if (wgt->flags & WZ_STATE_DISABLED)
+			{
+				ret = 0;
+			}
+			else if (wgt->first_child == 0 && wgt->parent != 0)
+			{
+                wz_ask_parent_to_focus_next(wgt);
+			}
+			else
+			{
+				ret = 0;
+			}
+			break;
+		}
+        */
 		case ALLEGRO_EVENT_KEY_CHAR:
 		{
 			if(event->keyboard.keycode == wgt->shortcut.keycode && ((event->keyboard.modifiers & wgt->shortcut.modifiers) || wgt->shortcut.modifiers == 0))