From 069c3eea17e1201b01296c2ab145b7a37857f6fd Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Wed, 12 Jun 2019 17:47:49 +0800
Subject: [PATCH] cleanup

---
 include/customial.h     | 43 ++++++++++++++++++++++++++++++---------
 src/ial/netial/netial.h | 45 ++---------------------------------------
 2 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/include/customial.h b/include/customial.h
index 5f4b69db..fb57a6c1 100644
--- a/include/customial.h
+++ b/include/customial.h
@@ -55,17 +55,42 @@
 extern "C" {
 #endif  /* __cplusplus */
 
+#define IAL_MOUSE_LEFTBUTTON    (1 << 0)
+#define IAL_MOUSE_RIGHTBUTTON   (1 << 1)
+#define IAL_MOUSE_MIDDLEBUTTON  (1 << 2)
 
-#define IAL_MOUSE_LEFTBUTTON    1
-#define IAL_MOUSE_RIGHTBUTTON   2
-#define IAL_MOUSE_MIDDLEBUTTON  4
-#define IAL_MOUSE_FOURTHBUTTON  8
-#define IAL_MOUSE_FIFTHBUTTON   16
-#define IAL_MOUSE_SIXTHBUTTON   32
-#define IAL_MOUSE_RESETBUTTON   64
+/* deprecated since 4.0.0
+#define IAL_MOUSE_FOURTHBUTTON  (1 << 3)
+#define IAL_MOUSE_FIFTHBUTTON   (1 << 4)
+#define IAL_MOUSE_SIXTHBUTTON   (1 << 5)
+#define IAL_MOUSE_SEVENTHBUTTON (1 << 6)
+#define IAL_MOUSE_EIGHTHBUTTON  (1 << 7)
 
-#define IAL_MOUSEEVENT          1
-#define IAL_KEYEVENT            2
+#define IAL_MOUSE_SIDEBUTTON    IAL_MOUSE_FOURTHBUTTON
+#define IAL_MOUSE_EXTRABUTTON   IAL_MOUSE_FIFTHBUTTON
+#define IAL_MOUSE_FORWARDBUTTON IAL_MOUSE_SIXTHBUTTON
+#define IAL_MOUSE_BACKBUTTON    IAL_MOUSE_SEVENTHBUTTON
+#define IAL_MOUSE_TASKBUTTON    IAL_MOUSE_EIGHTHBUTTON
+#define IAL_MOUSE_RESETBUTTON   IAL_MOUSE_EIGHTHBUTTON
+*/
+
+#define IAL_EVENT_MOUSE         (1 << 0)
+    #define IAL_MOUSEEVENT          IAL_EVENT_MOUSE
+#define IAL_EVENT_KEY           (1 << 1)
+    #define IAL_KEYEVENT            IAL_EVENT_KEY
+
+/* For pointer axis events. Since 4.0.0. */
+#define IAL_EVENT_AXIS          (1 << 2)
+/* For generic button pressed/released events. Since 4.0.0. */
+#define IAL_EVENT_BUTTON        (1 << 3)
+/* For multiple touch events. Since 4.0.0. */
+#define IAL_EVENT_MTOUCH        (1 << 4)
+/* For gesture events. Since 4.0.0. */
+#define IAL_EVENT_GESTURE       (1 << 5)
+/* For tablet events. Not implemented. */
+#define IAL_EVENT_TABLET        (1 << 6)
+/* For tablet pad events. Not implemented. */
+#define IAL_EVENT_TABLET_PAD    (1 << 7)
 
 typedef struct tagINPUT
 {
diff --git a/src/ial/netial/netial.h b/src/ial/netial/netial.h
index a46791bc..f3366338 100644
--- a/src/ial/netial/netial.h
+++ b/src/ial/netial/netial.h
@@ -35,53 +35,12 @@
 #ifndef GUI_IAL_NET_H
     #define GUI_IAL_NET_H
 
+#include "customial.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif  /* __cplusplus */
-#include "customial.h"
 
-#define IAL_MOUSE_LEFTBUTTON    1
-#define IAL_MOUSE_RIGHTBUTTON   2
-#define IAL_MOUSE_MIDDLEBUTTON  4
-#define IAL_MOUSE_FOURTHBUTTON  8
-#define IAL_MOUSE_FIFTHBUTTON   16
-#define IAL_MOUSE_SIXTHBUTTON   32
-#define IAL_MOUSE_RESETBUTTON   64
-
-#define IAL_MOUSEEVENT          1
-#define IAL_KEYEVENT            2
-/*
-typedef struct tagINPUT
-{
-    char*   id;
-
-    // Initialization and termination
-    BOOL (*init_input) (struct tagINPUT *input, const char* mdev, const char* mtype);
-    void (*term_input) (void);
-
-    // Mouse operations
-    int  (*update_mouse) (void);
-    void (*get_mouse_xy) (int* x, int* y);
-    void (*set_mouse_xy) (int x, int y);
-    int  (*get_mouse_button) (void);
-    void (*set_mouse_range) (int minx, int miny, int maxx, int maxy);
-    void (*suspend_mouse) (void);
-    int (*resume_mouse) (void);
-
-    // Keyboard operations
-    int  (*update_keyboard) (void);
-    const char* (*get_keyboard_state) (void);
-    void (*suspend_keyboard) (void);
-    int (*resume_keyboard) (void);
-    void (*set_leds) (unsigned int leds);
-
-    // Event
-    int (*wait_event) (int which, int maxfd, fd_set *in, fd_set *out, 
-            fd_set *except, struct timeval *timeout);
-
-    char mdev [MAX_PATH + 1];
-}INPUT;
-*/
 #ifdef _MGIAL_NET
 extern BOOL InitNetInput (INPUT* input, const char* mdev, const char* mtype);
 extern void TermNetInput (void);