frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refix mouse matrix computation for touch screens. Update usage message for 

-screen option
This commit is contained in:
Keith Packard 2002-10-31 18:29:50 +00:00
parent 28d191680e
commit f0a8d06fca
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/src/kdrive.c
View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.26 2002/09/29 23:39:46 keithp Exp $ * $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.28 2002/10/08 21:28:04 keithp Exp $
* *
* Copyright © 1999 Keith Packard * Copyright © 1999 Keith Packard
* *
@ -334,7 +334,7 @@ ddxUseMsg()
{ {
ErrorF("\nTinyX Device Dependent Usage:\n"); ErrorF("\nTinyX Device Dependent Usage:\n");
ErrorF("-card pcmcia Use PCMCIA card as additional screen\n"); ErrorF("-card pcmcia Use PCMCIA card as additional screen\n");
ErrorF("-screen WIDTHxHEIGHT[xDEPTH[xFREQ]][@ROTATION] Specify screen characteristics\n"); ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP{,DEPTH/BPP}[xFREQ]] Specify screen characteristics\n");
ErrorF("-zaphod Disable cursor screen switching\n"); ErrorF("-zaphod Disable cursor screen switching\n");
ErrorF("-2button Emulate 3 button mouse\n"); ErrorF("-2button Emulate 3 button mouse\n");
ErrorF("-3button Disable 3 button mouse emulation\n"); ErrorF("-3button Disable 3 button mouse emulation\n");

7
hw/kdrive/src/kinput.c
View File

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.26 2002/10/04 01:44:20 keithp Exp $ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.27 2002/10/30 21:25:53 keithp Exp $ */
#include "kdrive.h" #include "kdrive.h"
#include "inputstr.h" #include "inputstr.h"
@ -400,11 +400,12 @@ KdComputeMouseMatrix (KdMouseMatrix *m, Rotation randr, int width, int height)
break; break;
} }
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{
m->matrix[i][2] = 0;
for (j = 0 ; j < 2; j++) for (j = 0 ; j < 2; j++)
if (m->matrix[i][j] < 0) if (m->matrix[i][j] < 0)
m->matrix[i][2] = size[j] - 1; m->matrix[i][2] = size[j] - 1;
else }
m->matrix[i][2] = 0;
} }
static void static void