gpm-diff-first

gpm-1.20.0.tar.gz

diff -u -w ../../gpm-1.19.6/src/debuglog.c ./debuglog.c
--- ../../gpm-1.19.6/src/debuglog.c	Sun Dec 30 00:56:34 2001
+++ ./debuglog.c	Sat Dec 29 15:13:48 2001
@@ -37,6 +37,7 @@
 # endif
 #endif
 
+#include <stdlib.h>  /* exit */
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -74,13 +75,14 @@
 gpm_oops(char *f, int n, char *s, ...)
 {
   if (LOG_ERR <= gpm_debug_level) {
-    int pri;
     va_list ap;
 
 #if(defined(HAVE_VSYSLOG) && defined(HAVE_SYSLOG))
+    int pri;
     static char fmt[] = ": %m";
     char* buf = alloca(strlen(s)+sizeof(fmt));
-    strcpy(buf, s); strcat(buf, fmt);
+    strcpy(buf, s); 
+    strcat(buf, fmt);
 #endif
 
     va_start(ap, s);
diff -u -w ../../gpm-1.19.6/src/gpm-root.y ./gpm-root.y
--- ../../gpm-1.19.6/src/gpm-root.y	Sun Dec 30 00:56:34 2001
+++ ./gpm-root.y	Sat Dec 29 15:17:40 2001
@@ -1196,7 +1196,7 @@
   Draw *draw=NULL;
   DrawItem *item;
   char s[80];
-  int posty, postx, postX;
+  int posty=0, postx, postX;
   struct sigaction childaction;
   int evflag;
   int recursenow=0; /* not on first iteration */
diff -u -w ../../gpm-1.19.6/src/gpm.c ./gpm.c
--- ../../gpm-1.19.6/src/gpm.c	Sun Dec 30 00:56:34 2001
+++ ./gpm.c	Sat Dec 29 21:53:12 2001
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <unistd.h>        /* select(); */
 #include <signal.h>        /* SIGPIPE */
+#include <time.h>          /* time */
 #include <sys/param.h>
 #include <sys/fcntl.h>     /* O_RDONLY */
 #include <sys/wait.h>      /* wait()   */
@@ -235,6 +251,7 @@
   } 
 
   fd=open_console(O_WRONLY);
+  gpm_debug_log(LOG_DEBUG,"Paste %i",c);
   if (ioctl(fd, TIOCLINUX, &c) < 0)
      oops("ioctl(TIOCLINUX)");
   close(fd);
@@ -386,8 +407,25 @@
       {
       gpm_debug_log(LOG_NOTICE,"Skipping a data packet (?)");
       return NULL;
       }
+
+    /* Better debug output
+      29/12/2001 02:12. pebl*/
+    switch (protocol->packetlength)
+      {
+      case 4:
+	gpm_debug_log(LOG_DEBUG,"Data %02x %02x %02x %02x",data[0],data[1],data[2],data[3]);
+	break;
+      case 5:
+	gpm_debug_log(LOG_DEBUG,"Data %02x %02x %02x %02x %02x",data[0],data[1],data[2],data[3],data[4]);
+	break;
+      case 6:
+	gpm_debug_log(LOG_DEBUG,"Data %02x %02x %02x %02x %02x %02x",data[0],data[1],data[2],data[3],data[4],data[5]);
+	break;
+      default:
   gpm_debug_log(LOG_DEBUG,"Data %02x %02x %02x (%02x)",data[0],data[1],data[2],data[3]);
+      }
+    
   return data;
 }
 
@@ -532,7 +586,10 @@
        * Return information also if never happens, but enough time has elapsed.
        * Note: return 1 will segfault due to missing event->vc
        */
-      if (time(NULL)<=awaketime) return 0;
+      if (time(NULL)<=awaketime){ 	
+	gpm_debug_log(LOG_DEBUG,"No dy, dx or buttons");
+	return 0;
+      }
       awaketime=time(NULL)+1;
       break;
       }
@@ -1104,7 +1169,7 @@
       continue;
       }
 
-    gpm_debug_log(LOG_DEBUG,"selected %i times",pending);
+    gpm_debug_log(LOG_DEBUG,"select returned %i fd",pending);
 
 /*....................................... manage graphic mode */
 
diff -u -w ../../gpm-1.19.6/src/gpn.c ./gpn.c
--- ../../gpm-1.19.6/src/gpn.c	Sun Dec 30 00:56:34 2001
+++ ./gpn.c	Sat Dec 29 14:27:12 2001
@@ -460,7 +463,7 @@
     check_uniqueness();
     gpm_debug_log(LOG_INFO,"Signed");
 
-  } /*if*/
+  } /*if(gpm_log_daemon)*/
 
   /*
    * well, I used to create a symlink in the /tmp dir to be compliant with old
diff -u -w ../../gpm-1.19.6/src/libcurses.c ./libcurses.c
--- ../../gpm-1.19.6/src/libcurses.c	Sun Dec 30 00:56:34 2001
+++ ./libcurses.c	Fri Dec 21 16:13:05 2001
@@ -93,7 +93,7 @@
 /* JD patch 11/08/1998 */
 #define MAXNBPREVCHAR 4         /* I don't think more is usefull, JD */
     static int nbprevchar=0, prevchar[MAXNBPREVCHAR];
-    extern gpm_convert_event(char *data, Gpm_Event *event);
+    extern int gpm_convert_event(char *data, Gpm_Event *event);
     int c; unsigned char mdata[4];
 
 /* JD patch 11/08/1998 */
diff -u -w ../../gpm-1.19.6/src/liblow.c ./liblow.c
--- ../../gpm-1.19.6/src/liblow.c	Sun Dec 30 00:56:34 2001
+++ ./liblow.c	Fri Dec 21 16:13:11 2001
@@ -529,7 +529,7 @@
 #define DELAY_MS 100
         static struct timeval to={0,DELAY_MS*1000};
         static fd_set selSet;
-        extern gpm_convert_event(unsigned char *data, Gpm_Event *event);
+        extern int gpm_convert_event(unsigned char *data, Gpm_Event *event);
         int c; unsigned char mdata[4];
 
         if (nbprevchar)  /* if there are some consumed char ... */
diff -u -w ../../gpm-1.19.6/src/mice.c ./mice.c
--- ../../gpm-1.19.6/src/mice.c	Sun Dec 30 00:56:34 2001
+++ ./mice.c	Sat Dec 29 21:35:11 2001
@@ -93,7 +93,7 @@
 
 static int parse_argv(argv_helper *info, int argc, char **argv)
 {
-    int i, j, errors = 0;
+    int i, j=0, errors = 0;
     long l;
     argv_helper *p;
     char *s, *t;
@@ -595,8 +605,8 @@
    * and then switch to 4-byte mode.
    */
   static unsigned char prev=0;
   static Gpm_Type *mytype=mice; /* it is the first */
-  unsigned char b;
+  unsigned char b = 0;
 
   if (data[1]==GPM_EXTRA_MAGIC_1 && data[2]==GPM_EXTRA_MAGIC_2)
     {
@@ -665,10 +675,10 @@
   int  treshold;
 } wcmodell[] = {
   /* ModellName    Magic     MaxX     MaxY  Border  Tresh */
-     "UltraPad"  , "UD",        0,       0,    250,    20, 
-  /* "Intuos"    , "GD",        0,       0,      0,    20, not yet supported */
-     "PenPartner", "CT",        0,       0,      0,    20, 
-     "Graphire"  , "ET",     5103,    3711,      0,    20
+     {"UltraPad"  , "UD",        0,       0,    250,    20}, 
+  /* {"Intuos"    , "GD",        0,       0,      0,    20}, not yet supported */
+     {"PenPartner", "CT",        0,       0,      0,    20}, 
+     {"Graphire"  , "ET",     5103,    3711,      0,    20}
   };
 
 #define IsA(m) ((WacomModell==(-1))? 0:!strcmp(#m,wcmodell[WacomModell].name))
@@ -2045,6 +2107,7 @@
   * The first three strings are the name, an help line, a long name (if any)
   * Then come the functions: the decoder and the initializazion function
   *     (called I_* and M_*)
+  * Flags: 
   * Follows an array of four bytes: it is the protocol-identification, based
   *     on the first two bytes of a packet: if
   *     "((byte0 & proto[0]) == proto[1]) && ((byte1 & proto[2]) == proto[3])"
diff -u -w ../../gpm-1.19.6/src/mouse-test.c ./mouse-test.c
--- ../../gpm-1.19.6/src/mouse-test.c	Sun Dec 30 00:56:34 2001
+++ ./mouse-test.c	Sat Dec 29 21:55:30 2001
@@ -335,7 +371,7 @@
 	   devcount);
     printf("Please move the mouse. Press any key when done\r\n"
 	   " (You can specify your device name on cmdline, in order to\r\n"
-	   "  avoid this step\r\n. Different baud rates are tried at "
+	   "  avoid this step.)\r\n Different baud rates are tried at "
 	   "different times\r\n");
     
     timeout.tv_sec=10; /* max test time */
@@ -375,7 +436,7 @@
 	  }
 	}
     
-    } /* devcount>1 */
+    } /* while(devcount>1) */
 
   mousefd=devlist->fd;
   mousename=devlist->name;
diff -u -w ../../gpm-1.19.6/src/synaptics.c ./synaptics.c
--- ../../gpm-1.19.6/src/synaptics.c	Sun Dec 30 00:56:34 2001
+++ ./synaptics.c	Sat Dec 29 21:20:17 2001
@@ -212,48 +238,49 @@
 
 static param_data_type param_data [] = {
   /* enabling configuration parameters */
-  { "edge_motion_enabled",        Flag_Param,    &edge_motion_enabled        },
-  { "edge_motion_speed_enabled",  Flag_Param,    &edge_motion_speed_enabled  },
-  { "corner_taps_enabled",        Flag_Param,    &corner_taps_enabled        },
-  { "taps_enabled",               Flag_Param,    &taps_enabled               },
-  { "pressure_speed_enabled",     Flag_Param,    &pressure_speed_enabled     },
-  { "tossing_enabled",            Flag_Param,    &tossing_enabled            },
-  { "does_toss_use_static_speed", Flag_Param,    &does_toss_use_static_speed },
+  { "edge_motion_enabled",        Flag_Param,    {&edge_motion_enabled        }},
+  { "edge_motion_speed_enabled",  Flag_Param,    {&edge_motion_speed_enabled  }},
+  { "corner_taps_enabled",        Flag_Param,    {&corner_taps_enabled        }},
+  { "taps_enabled",               Flag_Param,    {&taps_enabled               }},
+  { "pressure_speed_enabled",     Flag_Param,    {&pressure_speed_enabled     }},
+  { "tossing_enabled",            Flag_Param,    {&tossing_enabled            }},
+  { "does_toss_use_static_speed", Flag_Param,    {&does_toss_use_static_speed }},
   /* pressure induced speed related configuration parameters */
-  { "low_pressure",               Integer_Param, &low_pressure               },
-  { "speed_up_pressure",          Integer_Param, &speed_up_pressure          },
-  { "pressure_factor",            Float_Param,   &pressure_factor            },
-  { "standard_speed_factor",      Float_Param,   &standard_speed_factor      },
+  { "low_pressure",               Integer_Param, {&low_pressure               }},
+  { "speed_up_pressure",          Integer_Param, {&speed_up_pressure          }},
+  { "pressure_factor",            Float_Param,   {&pressure_factor            }},
+  { "standard_speed_factor",      Float_Param,   {&standard_speed_factor      }},
   /* toss/catch related parameters */
-  { "min_toss_time",              Integer_Param, &min_toss_time              },
-  { "max_toss_time",              Integer_Param, &max_toss_time              },
-  { "toss_cleanup_time",          Integer_Param, &toss_cleanup_time          },
-  { "min_toss_dist",              Integer_Param, &min_toss_dist              },
-  { "static_toss_speed",          Integer_Param, &static_toss_speed          },
-  { "toss_speed_factor",          Float_Param,   &toss_speed_factor          },
+  { "min_toss_time",              Integer_Param, {&min_toss_time              }},
+  { "max_toss_time",              Integer_Param, {&max_toss_time              }},
+  { "toss_cleanup_time",          Integer_Param, {&toss_cleanup_time          }},
+  { "min_toss_dist",              Integer_Param, {&min_toss_dist              }},
+  { "static_toss_speed",          Integer_Param, {&static_toss_speed          }},
+  { "toss_speed_factor",          Float_Param,   {&toss_speed_factor          }},
   /* edge motion related configuration parameters */
-  { "edge_speed",                 Integer_Param, &edge_speed                 },
+  { "edge_speed",                 Integer_Param, {&edge_speed                 }},
   /* corner tap actions */
-  { "upper_left_action",          Corner_Param,  &corner_actions [0]         },
-  { "lower_left_action",          Corner_Param,  &corner_actions [1]         },
-  { "upper_right_action",         Corner_Param,  &corner_actions [2]         },
-  { "lower_right_action",         Corner_Param,  &corner_actions [3]         },
+  { "upper_left_action",          Corner_Param,  {&corner_actions [0]         }},
+  { "lower_left_action",          Corner_Param,  {&corner_actions [1]         }},
+  { "upper_right_action",         Corner_Param,  {&corner_actions [2]         }},
+  { "lower_right_action",         Corner_Param,  {&corner_actions [3]         }},
   /* use wmode */
-  { "use_wmode",		  Flag_Param,	 &use_wmode		     },
-  { "finger_threshold",		  Integer_Param, &finger_threshold	     },
-  { "tap_lower_limit",		  Integer_Param, &tap_lower_limit	     },
-  { "tap_upper_limit",		  Integer_Param, &tap_upper_limit	     },
-  { "tap_range",		  Integer_Param, &tap_range		     },
-  { "tap_interval",		  Integer_Param, &tap_interval		     },
-  { "drag_lock",		  Flag_Param,	 &drag_lock		     },
-  { "multiple_click_delay",	  Integer_Param, &multiple_click_delay	     },
+  { "use_wmode",		  Flag_Param,	 {&use_wmode		     }},
+  { "finger_threshold",		  Integer_Param, {&finger_threshold	     }},
+  { "tap_lower_limit",		  Integer_Param, {&tap_lower_limit	     }},
+  { "tap_upper_limit",		  Integer_Param, {&tap_upper_limit	     }},
+  { "tap_range",		  Integer_Param, {&tap_range		     }},
+  { "tap_interval",		  Integer_Param, {&tap_interval		     }},
+  { "drag_lock",		  Flag_Param,	 {&drag_lock		     }},
+  { "multiple_click_delay",	  Integer_Param, {&multiple_click_delay	     }},
   /* end of list */
-  { NULL,                         Flag_Param,    NULL                        }
+  { NULL,                         Flag_Param,    {NULL                        }}
 };
 
 
 /*
 ** The information returned in the identification packet.
+** STIG page 10
 */
 typedef struct {
   int info_model_code;
@@ -264,7 +291,19 @@
 
 /*
 ** The information returned in the model ID packet.
+** STIG page 11
 */
+
+#define INFO_ROT180_BITS      0x800000  /* bit 23    */
+#define INFO_PORTRAIT_BITS    0x400000	 /* bit 22    */
+#define INFO_SENSOR_BITS      0x3F0000	 /* bit 16-21 */
+#define INFO_HARDWARE_BITS    0x00FE00	 /* bit 9-15  */
+#define INFO_NEW_ABS_BITS     0x000080	 /* bit 7     */
+#define INFO_CAP_PEN_BITS     0x000040	 /* bit 6     */
+#define INFO_SIMPLE_CMD_BITS  0x000020	 /* bit 5     */
+#define INFO_GEOMETRY_BITS    0x00000F	 /* bit 0-3   */
+
+
 typedef struct {
   int info_rot180;
   int info_portrait;
@@ -276,83 +315,37 @@
   int info_geometry;
 } model_id_type;
 
-/*
-** The information returned in the extended capibility packet.
-*/
-
-typedef struct {
-  int cap_ext;
-  int cap_sleep;
-  int cap_four_button;
-  int cap_multi_finger;
-  int cap_palm_detect;
-} ext_cap_type;
-
-/*
-** The format of the reported absolute data.
-*/
-typedef struct {
-  int gesture;
-  int finger;
-  int left;
-  int middle;
-  int down;
-  int right;
-  int x;
-  int y;
-  int pressure;
-} report_type;
-
-
-/*
-** A location record.
-*/
-typedef struct {
-  int x;
-  int y;