Ticket #7354: tablet.patch

TabletInputDevice.cpp

@@ -29 +29 @@
 
 #include "TabletInputDevice.h"
 #include "kb_mouse_settings.h"
-#include "kb_mouse_driver.h"
+//#include "kb_mouse_driver.h"
+#include <keyboard_mouse_driver.h>
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -176 +177 @@
     device->fd = open(device->path, O_RDWR);
     if (device->fd<0)
         return B_ERROR;
+        
+    LOG("opening:%s\n",device->path);
 
     InitFromSettings(device);
     
@@ -198 +201 @@
     tablet_device *device = (tablet_device *)cookie;
     
     LOG("%s(%s)\n", __PRETTY_FUNCTION__, name);
-
+    LOG("closing:%s\n",device->path);
     close(device->fd);
     
     device->active = false;
@@ -265 +268 @@
     
     if (opcode == B_ENTRY_CREATED)
             AddDevice(path.Path());
+    /*
     else
             RemoveDevice(path.Path());
-    
+    */
     return status;  
 }
 
@@ -276 +280 @@
 TabletInputDevice::AddDevice(const char *path)
 {
     CALLED();
-
+    LOG("adding %s\n",path);
     tablet_device *device = new tablet_device(path);
     if (!device) {
         LOG("No memory\n");
@@ -289 +293 @@
     
     fDevices.AddItem(device);
     
+    LOG("registering input device: %s:%s\n",device->device_ref.name,(device->active) ? "yes":"no");
+    LOG("device path: %s\n",&device->path);
     return RegisterDevices(devices);
 }
 
@@ -298 +304 @@
 {
     CALLED();
     int32 i = 0;
+    input_device_ref *devices[2];
+    
+    devices[1] = NULL;
+    
     tablet_device *device = NULL;
     while ((device = (tablet_device *)fDevices.ItemAt(i)) != NULL) {
         if (!strcmp(device->path, path)) {
+            LOG("deleting node:%s\n",device->path);
+            devices[0] = &device->device_ref;
+            UnregisterDevices(devices);
             fDevices.RemoveItem(device);
             delete device;
             return B_OK;
-        }   
+        }
     }
     
     return B_ENTRY_NOT_FOUND;
+    
 }
 
 
@@ -320 +334 @@
     tablet_movement old_movements;
     uint32 buttons_state = 0;
     BMessage *message;
+    
+        
+    LOG("Entering DeviceWatcher for %s::%x\n",dev->path,dev->fd);
+    
     while (dev->active) {
         memset(&movements, 0, sizeof(movements));
         if (ioctl(dev->fd, MS_READ, &movements) != B_OK) {
-            snooze(10000); // this is a realtime thread, and something is wrong...
-            continue;
+            LOG("Failed ioctl from %s\n",dev->path);
+            LOG("RemovingDevice\n");
+            //snooze(10000); // this is a realtime thread, and something is wrong...
+            //close(dev->fd);
+            dev->active = false;
+            sSingletonTabletDevice->RemoveDevice(dev->path);
+            
+            return 0;
         }
         
         uint32 buttons = buttons_state ^ movements.buttons; 
-    
-        LOG("%s: buttons: 0x%lx, x: %f, y: %f, clicks:%ld, wheel_x:%ld, wheel_y:%ld\n", dev->device_ref.name, movements.buttons, 
-            movements.xpos, movements.ypos, movements.clicks, movements.wheel_xdelta, movements.wheel_ydelta);
-
-        movements.xpos /= 10206.0;
-        movements.ypos /= 7422.0;
+    /*
+        LOG("%s: buttons: 0x%lx, x: %f, y: %f, z: %f, clicks:%ld, wheel_x:%ld, wheel_y:%ld\n", dev->device_ref.name, movements.buttons, 
+            movements.xpos, movements.ypos, movements.pressure, movements.clicks, movements.wheel_xdelta, movements.wheel_ydelta);
+*/
+        //movements.xpos /= 10206.0;
+        //movements.ypos /= 7422.0;
         float x = movements.xpos;
         float y = movements.ypos;
 
-        LOG("%s: x: %f, y: %f, \n", dev->device_ref.name, x, y);
+        //LOG("%s: x: %f, y: %f, \n", dev->device_ref.name, x, y);
         
         if (buttons != 0) {
             message = new BMessage(B_MOUSE_UP);             
@@ -391 +415 @@
         old_movements = movements;
         
     }
-    
+    LOG("Exiting DeviceWatcher for %s\n",dev->path);
     return 0;
 }
 
@@ -436 +460 @@
 static char *
 get_short_name(const char *longName)
 {
+    LOG("longname:%s\n",longName);
     BString string(longName);
     BString name;
     
     int32 slash = string.FindLast("/");
     string.CopyInto(name, slash + 1, string.Length() - slash);
+    
     int32 index = atoi(name.String()) + 1;
     
     int32 previousSlash = string.FindLast("/", slash);
     string.CopyInto(name, previousSlash + 1, slash - previousSlash - 1); 
     name << " Tablet " << index;
+    
         
     return strdup(name.String());
+    
+    //return strdup(longName);
 }