Synced latest upstream code

Author: hugegreenbug

README.md

@@ -10,6 +10,10 @@
 #include <libevdevc/libevdevc_event.h>
 #include <libevdevc/libevdevc_mt.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef Success
 // from X.h
 #define Success 0
@@ -52,6 +56,7 @@ typedef struct EvdevInfo_ EvdevInfo, *EvdevInfoPtr;
 struct Evdev_ {
   syn_report_callback syn_report;
   void* syn_report_udata;
+  int got_valid_event;
 
   log_callback log;
   void* log_udata;
@@ -83,4 +88,8 @@ int EvdevWriteEventToFile(FILE* file, const struct input_event* event);
 int EvdevReadInfoFromFile(FILE* file, EvdevInfoPtr info);
 int EvdevReadEventFromFile(FILE* file, struct input_event* event);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif

description-pak

@@ -11,6 +11,9 @@
 #include <libevdevc/libevdevc_log.h>
 #include <libevdevc/libevdevc_mt.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* 1 MiB debug buffer of struct input_event objects */
 #define DEBUG_BUF_SIZE      65536
@@ -39,6 +42,8 @@ void Event_Free(EvdevPtr);
 void Event_Open(EvdevPtr);
 bool Event_Process(EvdevPtr, struct input_event*);
 void Event_Dump_Debug_Log(void *);
+void Event_Dump_Debug_Log_To(void *, const char*);
+void Event_Clear_Debug_Log(void *);
 
 int Event_Get_Left(EvdevPtr);
 int Event_Get_Right(EvdevPtr);
@@ -57,9 +62,14 @@ int Event_Get_Slot_Count(EvdevPtr);
 int Event_Get_Button_Left(EvdevPtr);
 int Event_Get_Button_Middle(EvdevPtr);
 int Event_Get_Button_Right(EvdevPtr);
+int Event_Get_Button(EvdevPtr, int button);
 void Event_Sync_State(EvdevPtr);
 const char* Event_To_String(int type, int code);
 const char* Event_Type_To_String(int type);
 const char* Evdev_Get_Version();
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif

include/libevdevc/libevdevc.h

@@ -12,6 +12,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Evdev_;
 typedef struct Evdev_ *EvdevPtr;
 
@@ -32,5 +36,8 @@ typedef struct Evdev_ *EvdevPtr;
     (evdev)->log((evdev)->log_udata, LOGLEVEL_WARNING, \
     "%s():%d: " format, __FUNCTION__, __LINE__, ##__VA_ARGS__)
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
 
 #endif

include/libevdevc/libevdevc_event.h

@@ -11,6 +11,10 @@
 #include <stdint.h>
 #include <libevdevc/libevdevc_log.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * From include/linux/input.h
  * (as per linux-2.6.git:771d6d85667d68a17c24c452979f8d37cc628082)
@@ -55,4 +59,8 @@ void MT_Slot_Value_Set(MtSlotPtr, int, int);
 
 void MT_Slot_Sync(EvdevPtr, MTSlotInfoPtr);
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif

include/libevdevc/libevdevc_log.h

@@ -6,6 +6,10 @@
 #ifndef _LIBEVDEV_UTIL_H_
 #define _LIBEVDEV_UTIL_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Helper for bit operations
 #define LONG_BITS (sizeof(long) * 8)
 #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
@@ -25,5 +29,8 @@ static inline void AssignBit(unsigned long* array, int bit, int value)
         array[bit / LONG_BITS] &= ~mask;
 }
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
 
 #endif

include/libevdevc/libevdevc_mt.h

@@ -65,12 +65,10 @@ int EvdevRead(EvdevPtr evdev) {
 
     /* Read as many whole struct input_event objects as we can into the
        circular buffer */
-    if (evstate->debug_buf) {
-      for (i = 0; i < len / sizeof(*ev); i++) {
-        evstate->debug_buf[evstate->debug_buf_tail] = ev[i];
-        evstate->debug_buf_tail =
-            (evstate->debug_buf_tail + 1) % DEBUG_BUF_SIZE;
-      }
+    for (i = 0; i < len / sizeof(*ev); i++) {
+      evstate->debug_buf[evstate->debug_buf_tail] = ev[i];
+      evstate->debug_buf_tail =
+          (evstate->debug_buf_tail + 1) % DEBUG_BUF_SIZE;
     }
 
     /* kernel always delivers complete events, so len must be sizeof *ev */
@@ -502,9 +500,6 @@ Absinfo_Print(EvdevPtr device, struct input_absinfo* absinfo)
  */
 static EvdevClass EvdevProbeClass(EvdevInfoPtr info) {
   int bit;
-  for (bit = 0; bit < BTN_MISC; bit++)
-    if (TestBit(bit, info->key_bitmask))
-      return EvdevClassKeyboard;
 
   if (TestBit(REL_X, info->rel_bitmask) &&
       TestBit(REL_Y, info->rel_bitmask)) {
@@ -539,6 +534,10 @@ static EvdevClass EvdevProbeClass(EvdevInfoPtr info) {
       return EvdevClassTouchscreen;
   }
 
+  for (bit = 0; bit < BTN_MISC; bit++)
+    if (TestBit(bit, info->key_bitmask))
+      return EvdevClassKeyboard;
+
   return EvdevClassUnknown;
 }
 

include/libevdevc/libevdevc_util.h

@@ -53,6 +53,8 @@ static void Event_Rel(EvdevPtr, struct input_event*);
 
 static void Event_Get_Time(struct timeval*, bool);
 
+static int Event_Is_Valid(struct input_event*);
+
 const char*
 Evdev_Get_Version() {
     return VCSID;
@@ -180,19 +182,25 @@ Event_Get_Slot_Count(EvdevPtr device)
 int
 Event_Get_Button_Left(EvdevPtr device)
 {
-    return TestBit(BTN_LEFT, device->key_state_bitmask);
+    return Event_Get_Button(device, BTN_LEFT);
 }
 
 int
 Event_Get_Button_Middle(EvdevPtr device)
 {
-    return TestBit(BTN_MIDDLE, device->key_state_bitmask);
+    return Event_Get_Button(device, BTN_MIDDLE);
 }
 
 int
 Event_Get_Button_Right(EvdevPtr device)
 {
-    return TestBit(BTN_RIGHT, device->key_state_bitmask);
+    return Event_Get_Button(device, BTN_RIGHT);
+}
+
+int
+Event_Get_Button(EvdevPtr device, int button)
+{
+    return TestBit(button, device->key_state_bitmask);
 }
 
 #define CASE_RETURN(s) \
@@ -249,6 +257,10 @@ Event_To_String(int type, int code) {
         CASE_RETURN(BTN_LEFT);
         CASE_RETURN(BTN_RIGHT);
         CASE_RETURN(BTN_MIDDLE);
+        CASE_RETURN(BTN_BACK);
+        CASE_RETURN(BTN_FORWARD);
+        CASE_RETURN(BTN_EXTRA);
+        CASE_RETURN(BTN_SIDE);
         CASE_RETURN(BTN_TOUCH);
         CASE_RETURN(BTN_TOOL_FINGER);
         CASE_RETURN(BTN_TOOL_DOUBLETAP);
@@ -389,9 +401,11 @@ Event_Sync_State(EvdevPtr device)
         MT_Slot_Sync(device, &req);
     }
 
-    /* Get current slot id */
-    if (EvdevProbeAbsinfo(device, ABS_MT_SLOT) == Success)
+    /* Get current slot id for multi-touch devices*/
+    if (TestBit(ABS_MT_SLOT, device->info.abs_bitmask) &&
+        (EvdevProbeAbsinfo(device, ABS_MT_SLOT) == Success)) {
         MT_Slot_Set(device, device->info.absinfo[ABS_MT_SLOT].value);
+    }
 
     Event_Get_Time(&device->after_sync_time, device->info.is_monotonic);
 
@@ -453,6 +467,12 @@ bool
 Event_Process(EvdevPtr device, struct input_event* ev)
 {
     Event_Print(device, ev);
+    if (Event_Is_Valid(ev)) {
+        if (!(ev->type == EV_SYN && ev->code == SYN_REPORT))
+            device->got_valid_event = 1;
+    } else {
+        return false;
+    }
 
     switch (ev->type) {
     case EV_SYN:
@@ -480,14 +500,19 @@ Event_Process(EvdevPtr device, struct input_event* ev)
  * Dump the log of input events to disk
  */
 void
-Event_Dump_Debug_Log(void* vinfo)
+Event_Dump_Debug_Log(void* vinfo) {
+    Event_Dump_Debug_Log_To(vinfo, "/var/log/xorg/cmt_input_events.dat");
+}
+
+void
+Event_Dump_Debug_Log_To(void* vinfo, const char* filename)
 {
     EvdevPtr device = (EvdevPtr) vinfo;
     size_t i;
     int ret;
     EventStatePtr evstate = device->evstate;
 
-    FILE* fp = fopen("/var/log/xorg/cmt_input_events.dat", "wb");
+    FILE* fp = fopen(filename, "wb");
     if (!fp) {
         LOG_ERROR(device, "fopen() failed for debug log");
         return;
@@ -512,6 +537,19 @@ Event_Dump_Debug_Log(void* vinfo)
     fclose(fp);
 }
 
+/**
+ * Clear Debug Buffer
+ */
+void
+Event_Clear_Debug_Log(void* vinfo)
+{
+    EvdevPtr device = (EvdevPtr) vinfo;
+    EventStatePtr evstate = device->evstate;
+
+    memset(evstate->debug_buf, 0, sizeof(evstate->debug_buf));
+    evstate->debug_buf_tail = 0;
+}
+
 /**
  * Clear EV_REL event state.  This function should be called after a EV_SYN
  * event is processed because EV_REL event state is not accumulative.
@@ -557,11 +595,13 @@ static void
 Event_Syn_Report(EvdevPtr device, struct input_event* ev)
 {
     EventStatePtr evstate = device->evstate;
-    device->syn_report(device->syn_report_udata, evstate, &ev->time);
+    if (device->got_valid_event)
+        device->syn_report(device->syn_report_udata, evstate, &ev->time);
 
     MT_Print_Slots(device);
 
     Event_Clear_Ev_Rel_State(device);
+    device->got_valid_event = 0;
 }
 
 static void
@@ -656,3 +696,12 @@ Event_Rel(EvdevPtr device, struct input_event* ev)
         break;
     }
 }
+
+static int Event_Is_Valid(struct input_event* ev)
+{
+    /* Key repeats are invalid. They're handled by X anyway */
+    if (ev->type == EV_KEY &&
+        ev->value == 2)
+        return 0;
+    return 1;
+}

src/libevdevc.c

@@ -21,6 +21,8 @@ install-lib: CC_LIBRARY(src/libevdevc.so.0) CC_LIBRARY(src/libevdevc_hollow.so.0
 	install -D -m 0755 src/libevdevc_hollow.so.0 \
 		$(DESTDIR)$(LIBDIR)/libevdevc_hollow.so.0
 	ln -f -s libevdevc_hollow.so.0 $(DESTDIR)$(LIBDIR)/libevdevc_hollow.so
+	install -D -m 0644 $(SRC)/libevdevc-cros.pc \
+			$(DESTDIR)$(LIBDIR)/pkgconfig/libevdevc-cros.pc
 
 setup-lib-in-place:
 	mkdir -p $(SRC)/in-place || true