sr: Touch UI

Change-Id: I4ee87f3474aec0496c47bb561ddecc74e151cbbf

1 files changed, 90 insertions, 3 deletions

diff --git a/ui.h b/ui.h
index 123dc34..acf3645 100644
--- a/ui.h
+++ b/ui.h
@@ -24,6 +24,72 @@
 #include "messagesocket.h"
 #include "voldclient.h"
 
+#define MAX_NR_INPUT_DEVICES    8
+#define MAX_NR_VKEYS            8
+
+/*
+ * Simple representation of a (x,y) coordinate with convenience operators
+ */
+struct point {
+    point() : x(0), y(0) {}
+    point operator+(const point& rhs) const {
+        point tmp;
+        tmp.x = x + rhs.x;
+        tmp.y = y + rhs.y;
+        return tmp;
+    }
+    point operator-(const point& rhs) const {
+        point tmp;
+        tmp.x = x - rhs.x;
+        tmp.y = y - rhs.y;
+        return tmp;
+    }
+
+    int         x;
+    int         y;
+};
+
+/*
+ * Virtual key representation.  Valid when keycode != -1.
+ */
+struct vkey {
+    vkey() : keycode(-1) {}
+    int         keycode;
+    point       min;
+    point       max;
+};
+
+/*
+ * Input device representation.  Valid when fd != -1.
+ * This holds all information and state related to a given input device.
+ */
+struct input_device {
+    input_device() : fd(-1) {}
+
+    int         fd;
+    vkey        virtual_keys[MAX_NR_VKEYS];
+    point       touch_min;
+    point       touch_max;
+
+    int         rel_sum;            // Accumulated relative movement
+
+    bool        saw_pos_x;          // Did sequence have ABS_MT_POSITION_X?
+    bool        saw_pos_y;          // Did sequence have ABS_MT_POSITION_Y?
+    bool        saw_mt_report;      // Did sequence have SYN_MT_REPORT?
+    bool        saw_tracking_id;    // Did sequence have SYN_TRACKING_ID?
+    bool        in_touch;           // Are we in a touch event?
+    bool        in_swipe;           // Are we in a swipe event?
+
+    point       touch_pos;          // Current touch coordinates
+    point       touch_start;        // Coordinates of touch start
+    point       touch_track;        // Last tracked coordinates
+
+    int         slot_nr_active;
+    int         slot_first;
+    int         slot_current;
+    int         tracking_id;
+};
+
 // Abstract class for controlling the user interface during recovery.
 class RecoveryUI {
   public:
@@ -40,7 +106,7 @@ class RecoveryUI {
     virtual void SetLocale(const char* locale) = 0;
 
     // Set the overall recovery state ("background image").
-    enum Icon { NONE, INSTALLING_UPDATE, ERASING, NO_COMMAND, INFO, ERROR, NR_ICONS };
+    enum Icon { NONE, INSTALLING_UPDATE, ERASING, NO_COMMAND, D_INFO, D_ERROR, NR_ICONS };
     virtual void SetBackground(Icon icon) = 0;
 
     // --- progress indicator ---
@@ -71,9 +137,11 @@ class RecoveryUI {
     virtual void PrintOnScreenOnly(const char* fmt, ...) __printflike(2, 3) = 0;
 
     virtual void ShowFile(const char* filename) = 0;
+    virtual void ClearText() = 0;
 
     virtual void DialogShowInfo(const char* text) = 0;
     virtual void DialogShowError(const char* text) = 0;
+    virtual void DialogShowErrorLog(const char* text) = 0;
     virtual int  DialogShowing() const = 0;
     virtual bool DialogDismissable() const = 0;
     virtual void DialogDismiss() = 0;
@@ -119,6 +187,9 @@ class RecoveryUI {
 
     // --- menu display ---
 
+    virtual int MenuItemStart() const = 0;
+    virtual int MenuItemHeight() const = 0;
+
     // Display some header text followed by a menu of items, which appears
     // at the top of the screen (in place of any scrolling ui_print()
     // output, if necessary).
@@ -127,7 +198,7 @@ class RecoveryUI {
 
     // Set the menu highlight to the given index, wrapping if necessary.
     // Returns the actual item selected.
-    virtual int SelectMenu(int sel) = 0;
+    virtual int SelectMenu(int sel, bool abs = false) = 0;
 
     // End menu mode, resetting the text overlay so that ui_print()
     // statements will be displayed.
@@ -159,6 +230,11 @@ private:
     bool has_up_key;
     bool has_down_key;
 
+    input_device input_devices[MAX_NR_INPUT_DEVICES];
+
+    point fb_dimensions;
+    point min_swipe_px;
+
     struct key_timer_t {
         RecoveryUI* ui;
         int key_code;
@@ -173,7 +249,10 @@ private:
 
     static int InputCallback(int fd, uint32_t epevents, void* data);
     int OnInputEvent(int fd, uint32_t epevents);
-    void ProcessKey(int key_code, int updown);
+    void ProcessKey(input_device* dev, int key_code, int updown);
+    void ProcessSyn(input_device* dev, int code, int value);
+    void ProcessAbs(input_device* dev, int code, int value);
+    void ProcessRel(input_device* dev, int code, int value);
 
     bool IsUsbConnected();
 
@@ -181,6 +260,14 @@ private:
 
     static void* time_key_helper(void* cookie);
     void time_key(int key_code, int count);
+
+    void process_touch(int fd, struct input_event *ev);
+    void calibrate_touch(input_device* dev);
+    void setup_vkeys(input_device* dev);
+    void calibrate_swipe();
+    void handle_press(input_device* dev);
+    void handle_release(input_device* dev);
+    void handle_gestures(input_device* dev);
 };
 
 #endif  // RECOVERY_UI_H