Merge lp:~ace17/wizardpen/trunk into lp:wizardpen

[Sebastien Alaiwan]

Cleanup dead code + set default value for MouseSpeed, otherwise it defaults to zero, making the mouse impossible to move.

Unmerged revisions

58. By Sebastien Alaiwan on 2014-05-22

Cleanup unused default options

57. By Sebastien Alaiwan on 2014-05-22

Set a non-zero default value for MouseSpeed.

56. By Sebastien Alaiwan on 2014-05-22

Remove dead code

55. By Sebastien Alaiwan on 2014-05-22

Fix warning about 'const'

=== modified file 'src/wizardpen.c'
--- src/wizardpen.c	2011-11-11 00:49:02 +0000
+++ src/wizardpen.c	2014-05-22 16:01:51 +0000
@@ -92,13 +92,8 @@
 
 static const char *default_options[] =
 {
-    "BaudRate", "9600",
-    "StopBits", "1",
-    "DataBits", "8",
-    "Parity", "Odd",
-    "Vmin", "1",
-    "Vtime", "10",
-    "FlowControl", "Xoff",
+    "MouseSpeed", "24",
+    "MouseAccel", "1",
     NULL
 };
 
@@ -186,7 +181,7 @@
     snprintf(str, EV_DEV_NAME_MAXLEN, "%s%d", DEV_INPUT_EVENT, num)
 
 static Bool
-fd_query_wizardpen(int fd, char *wizardpen_name) {
+fd_query_wizardpen(int fd, const char *wizardpen_name) {
     char name[256] = "Unknown";
     int cmp_at = strlen(wizardpen_name);
     if (cmp_at > 255)
@@ -208,7 +203,7 @@
     Bool have_evdev = FALSE;
     int noent_cnt = 0;
     const int max_skip = 10;
-    char *wizardpen_name = xf86FindOptionValue(local->options, "Name");
+    const char *wizardpen_name = xf86FindOptionValue(local->options, "Name");
     char fname[EV_DEV_NAME_MAXLEN];
     int np;
 
@@ -337,7 +332,7 @@
 {
     WizardPenPrivatePtr priv = calloc (1, sizeof(WizardPenPrivateRec));
     int msgtype;
-    char *s;
+    const char *s;
     int rc = Success;
 
     if (!priv) {
@@ -466,7 +461,7 @@
     if (s && strlen(s) > 0) {
         priv->bottomZ = parsePercentage(s, priv->maxZ);
     }
-    
+
     s = xf86FindOptionValue(local->options, "KeepShape");
     if (s && strlen(s) > 0) {
         priv->keepShape = parseBool(s);
@@ -535,7 +530,7 @@
         priv->mouseAccel = parseBool(s);
         xf86Msg(X_CONFIG, "%s: MouseAccel = %d\n", local->name, priv->mouseAccel);
     }
-    
+
     s = xf86FindOptionValue(local->options, "ReportScreen");
     if (s && strlen(s) > 0) {
         priv->reportScreen = parseBool(s);
@@ -1125,7 +1120,7 @@
                         if(event->value)
                           priv->activeButtons |= WIZARDPEN_BTN_TOUCH;
                         else
-                          priv->activeButtons &= ~WIZARDPEN_BTN_TOUCH;                          
+                          priv->activeButtons &= ~WIZARDPEN_BTN_TOUCH;
                         if(!event->value)
                         {
                             buttons = set_bit(buttons, 2, 0); /* try to clear events to prevent some becoming 'locked' in the active state */
@@ -1292,44 +1287,6 @@
 }
 #endif // #ifdef LINUX_INPUT
 
-#define WriteString(str)\
-    XisbWrite (priv->buffer, (unsigned char *)(str), strlen(str))
-
-static Bool
-QueryHardware (WizardPenPrivatePtr priv)
-{
-    /* Reset */
-    WriteString(WIZARDPEN_RESET);
-
-    /* Wait */
-    milisleep (250);
-
-    /* Prompt Mode in order to not be disturbed */
-    WriteString(WIZARDPEN_PROMPT_MODE);
-
-    /* Flush */
-    while (XisbRead(priv->buffer) >= 0);
-
-    /* Ask for Config packet*/
-    WriteString(WIZARDPEN_CONFIG);
-
-    /* Read the packet */
-    XisbBlockDuration (priv->buffer, 1000000);
-    NewPacket (priv);
-
-    if ((WizardPenGetPacket (priv) == Success))
-    {
-        priv->maxX = (int)priv->packet[1] + ((int)priv->packet[2] << 7);
-        priv->maxY = (int)priv->packet[3] + ((int)priv->packet[4] << 7);
-        priv->maxZ = 512; // FIXME: some tablets go to 1024
-        xf86Msg(X_PROBED, "Wizardpen Tablet MaxX:%d MaxY:%d\n", priv->maxX, priv->maxY);
-    }
-    else
-        return !Success;
-
-    return Success;
-}
-
 #define BITS_PER_LONG (sizeof(long) * 8)
 #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
 #define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
@@ -1383,7 +1340,7 @@
                     }
                 }
         }
-    
+
     // FIXME: do we need to check this or is it always the same?
     if (aX + aY > bX + bY)
     {