obsolete-buildroot/sources/tinyx-011010.patch

   1 diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h
   2 --- xc-011010.src/include/extensions/lbxstr.h   Tue Jul 31 20:44:35 2001
   3 +++ xc-011010/include/extensions/lbxstr.h       Sun Apr 21 12:35:05 2002
   4 @@ -25,7 +25,7 @@
   5  #ifndef _LBXSTR_H_
   6  #define _LBXSTR_H_
   7
   8 -#include <X11/extensions/XLbx.h>
   9 +#include "XLbx.h"
  10
  11  #define LBXNAME "LBX"
  12
  13 diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h
  14 --- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h      Sun Jun  3 17:52:45 2001
  15 +++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h  Sun Apr 21 12:36:25 2002
  16 @@ -29,6 +29,7 @@
  17  #include <linux/fb.h>
  18  #include <unistd.h>
  19  #include <sys/mman.h>
  20 +#include <sys/types.h>
  21  #include "kdrive.h"
  22  #include "layer.h"
  23
  24 diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h
  25 --- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c Tue Jul 10 22:58:19 2001
  26 +++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c     Tue Apr 23 20:16:23 2002
  27 @@ -33,65 +33,48 @@
  28  #include "kdrive.h"
  29  #include "Xpoll.h"
  30  #include <sys/ioctl.h>
  31 -#include <linux/h3600_ts.h>    /* touch screen events */
  32 +
  33 +typedef struct {
  34 +  unsigned short          pressure;
  35 +  unsigned short          x;
  36 +  unsigned short          y;
  37 +  unsigned short          pad;
  38 +  struct timeval  stamp;
  39 +} TS_EVENT;
  40
  41  static long lastx = 0, lasty = 0;
  42  int TsScreen;
  43  extern int TsFbdev;
  44
  45 -void
  46 -TsRead (int tsPort, void *closure)
  47 -{
  48 -    TS_EVENT       event;
  49 -    long           buf[3];
  50 -    int                    n;
  51 -    long           pressure;
  52 -    long           x, y;
  53 -    unsigned long   flags;
  54 -    unsigned long   buttons;
  55 -
  56 -    n = Ps2ReadBytes (tsPort, (char *) &event,
  57 -                        sizeof (event), sizeof (event));
  58 -    if (n == sizeof (event))
  59 -    {
  60 -       if (event.pressure)
  61 -       {
  62 -           /*
  63 -            * HACK ATTACK.  (static global variables used !)
  64 -            * Here we test for the touch screen driver actually being on the
  65 -            * touch screen, if it is we send absolute coordinates. If not,
  66 -            * then we send delta's so that we can track the entire vga screen.
  67 -            */
  68 -           if (TsScreen == TsFbdev) {
  69 -               flags = KD_BUTTON_1;
  70 -               x = event.x;
  71 -               y = event.y;
  72 -           } else {
  73 -               flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA;
  74 -               if ((lastx == 0) || (lasty == 0)) {
  75 -                   x = 0;
  76 -                   y = 0;
  77 -               } else {
  78 -                   x = event.x - lastx;
  79 -                   y = event.y - lasty;
  80 -               }
  81 -               lastx = event.x;
  82 -               lasty = event.y;
  83 -           }
  84 -       } else {
  85 -           flags = KD_MOUSE_DELTA;
  86 -           x = 0;
  87 -           y = 0;
  88 -           lastx = 0;
  89 -           lasty = 0;
  90 -       }
  91 -       KdEnqueueMouseEvent (flags, x, y);
  92 +void TsRead (int tsPort, void *closure) {
  93 +  TS_EVENT        event;
  94 +  long            buf[3];
  95 +  int             n;
  96 +  long            pressure;
  97 +  long            x, y;
  98 +  unsigned long   flags;
  99 +  unsigned long   buttons;
 100 +
 101 +  n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event));
 102 +  if (n >= sizeof (event)) {
 103 +    if (event.pressure >= 100) {
 104 +      flags = KD_BUTTON_1;
 105 +      x = (960 - event.x) * 640 / (920);
 106 +      y = (960 - event.y) * 480 / (920);
 107 +      //ErrorF("flags %d x %d y %dn",flags,event.x,event.y);
 108 +    }
 109 +    else {
 110 +      flags = KD_MOUSE_DELTA;
 111 +      x = lastx;
 112 +      y = lasty;
 113      }
 114 +    KdEnqueueMouseEvent(flags, x, y);
 115 +  }
 116  }
 117
 118  char   *TsNames[] = {
 119 -  "/dev/ts",
 120 -  "/dev/h3600_ts" /* temporary name; note this code can try
 121 +  "/dev/ucb1x00-ts",
 122 +  "/dev/ts" /* temporary name; note this code can try
 123                            to open more than one device */
 124  };
 125
 126 @@ -99,9 +82,7 @@
 127
 128  int TsInputType;
 129
 130 -int
 131 -TsInit (void)
 132 -{
 133 +int TsInit (void) {
 134      int            i;
 135      int            TsPort;
 136
 137 diff -Nur xc-011010.src/startx xc-011010/startx
 138 --- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx      Thu Apr 25 05:20:35 2002
 139 +++ xc-011010/startx    Sun Apr 28 05:35:35 2002
 140 @@ -0,0 +1,11 @@
 141 +#!/bin/sh
 142 +killall Xfbdev
 143 +sleep 1
 144 +export DISPLAY=":0"
 145 +/usr/X11R6/bin/Xfbdev -ac &
 146 +sleep 4
 147 +/usr/X11R6/bin/matchbox &
 148 +sleep 1
 149 +/usr/X11R6/bin/minisys &
 150 +/usr/X11R6/bin/minitime &
 151 +/usr/X11R6/bin/rxvt &
 152 diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y
 153 --- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y       Thu Apr 25 05:20:35 2002
 154 +++ xc-011010/lib/Xft/xftgram.y Sun Apr 28 05:35:35 2002
 155 @@ -165,6 +165,7 @@
 156                     matrix.yx = $4;
 157                     matrix.__REALLY_YY__ = $5;
 158                 }
 159 +       ;
 160  number :   INTEGER
 161                 { $$ = (double) $1; }
 162         |   DOUBLE
 163 diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y
 164 --- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y     Thu Apr 25 05:20:35 2002
 165 +++ xc-011010/programs/twm/gram.y       Sun Apr 28 05:35:35 2002
 166 @@ -650,6 +650,7 @@
 167                                           RemoveDQuote(ptr);
 168                                           $$ = ptr;
 169                                         }
 170 +               ;
 171  number         : NUMBER                { $$ = $1; }
 172                 ;
 173