From 3dcd2439729ed0adbc450aee35a8108662fae2f1 Mon Sep 17 00:00:00 2001
From: dschmenk <l3matinracing>
Date: Fri, 28 Jun 2013 10:21:12 -0700
Subject: [PATCH] Rework mouse code for better acceleration

formatting updated
---
 src/A2PI.PO         | Bin 143360 -> 143360 bytes
 src/Makefile        |   0
 src/a2lib.c         |   0
 src/a2mon.c         |   0
 src/a2pid.c         |  28 ++++++++++++++++------------
 src/a2serclk.c      |   0
 src/a2slideshow.mon |   0
 src/bintomon.c      |   0
 src/dskread.c       |   0
 src/dskwrite.c      |   0
 10 files changed, 16 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 src/A2PI.PO
 mode change 100644 => 100755 src/Makefile
 mode change 100644 => 100755 src/a2lib.c
 mode change 100644 => 100755 src/a2mon.c
 mode change 100644 => 100755 src/a2pid.c
 mode change 100644 => 100755 src/a2serclk.c
 mode change 100644 => 100755 src/a2slideshow.mon
 mode change 100644 => 100755 src/bintomon.c
 mode change 100644 => 100755 src/dskread.c
 mode change 100644 => 100755 src/dskwrite.c

diff --git a/src/A2PI.PO b/src/A2PI.PO
old mode 100644
new mode 100755
index f021a0d33f3713213f590d96cc0e3410b969395d..c80081da7e164258c6f8e493086509bf87a28510
GIT binary patch
delta 669
zcmZ8dO=uHA6i%9Cca2rD4{c(+ELenKL98b)dgvvG)kE=+vtC;8ptl~B#-A-(I)Yv6
zrJ&<#(XC0?xHf4L+a@)EMv`U3*isM)h(Qx6ftI2m=-Uu49cJEp-}k+rnTghgXk9Q|
z9_KaH?K$qun<qS<WYyXpoF4WctkB{rHONMxTq~`wnf_tj`TFAggL4%^SFI8)t(UA?
zg%MgTy`$ZvJxZmxNuND8OhP}_Hvi|C>2H2_pI%US-Jx*A1o8&R0+1AtwA$C~A2K1t
zlQej7A<u%eH_4SxF__~qv%{u95%j#Wuffmp<u&#y5=%pSfF6;mA_d(kRn;5K03h(&
zK#Zk;?Wb3#QtFH506w+WJT{(#xG!JL0Xt9cC54dCcF9|!^%mH7YYEs_>Y7>tdI*b+
z4Q!qnbCX5L{Bn~F(8I{a7vVq#*ic8~L(ys$+6j3^oc9TORC@U*;mhC8fqqLeMM)PY
z(bZ=eiC@b5?&93|_DL7nap7GZa#hstpo|S|o3X8YRwP-_Cosg~cosQzwiODR&<;-U
zVf)*XoWdnch%LZ~FeVx5msUXg*`r!N2G#eUy{31o=+Sn1#={_82KhRar&+J2N*x%H
zA3^ycJF3mt*no%-)*s`jk?xUy`yyfeNf)6*0&RB}M1`}TBVoW#%AJ5LLtyl8mmPJG
w6|e=(@$@u@nGKHhG<a(nSle0w){^@{b71*RZjbT-l`Gus<Ze2->%4I0A4j4v{r~^~

delta 634
zcmX|9O=uHA6wWru?%E&NeP|QoWkD?ldui~XAR_dV!(J?c@m9Rp-o#Tc(zUupYe#HW
z@gUfBA=OEClihBm_8=sU0T=BuVyt+Jpg~h90ZUO3bT$nRGw;3c``&x=!zc}2Y4CP9
z%8Y1{=n(VVJs$la$JTWly{UbAU$4~lR{{7~@#?ir_re%vG$nd=`Fwt10O{*~O|Na%
z{Q6tse*YSaWVcg;xT116q_PMD$^$9@G67lIVC%>zh9rk9=%s`5B%${^tT#d+$I;9V
zYl6z-vbwLy<v8y(DP&9w+Qa%msVeG#8L6sWYsG<rSO7%R1k$HpnK!kktzqV}R&O1i
zcEA$K8xD|B{kFp=`F2?TBKpffzUljEiT#<jT$_rZBCP$2pc3c@C~FmAphQbL8kbZy
zY-qob?}&MU$BOjqPf;k}bpX#uSd<pUIqDjZ$V2N=S;*4ete;`D6Q&0Y$<?DGzDZ@;
zFtDY-$|po*1D>TJEw*gRX}PWBX$<YeESC-*%VAZvh`}tt1V1G$!Lj)G$#MOb!+Qz|
z%P$4*9_cd{q%$C01o<j>S>s2Ko7(oH*|C(d(=$!_4Q)@&$n)UcCx?s&0bYU(pT>{r
z&J*1w{}wW7yx2w5QG(j;ToqL|xSd1;Zcgq5$c6ai-!3~DLMspmM(7Dk6PqmQX>vop
l3#9F@0NIigV1#J-b#_nsue_5JH%hy!rCsLSDf)$a{{d3Y4n+U}

diff --git a/src/Makefile b/src/Makefile
old mode 100644
new mode 100755
diff --git a/src/a2lib.c b/src/a2lib.c
old mode 100644
new mode 100755
diff --git a/src/a2mon.c b/src/a2mon.c
old mode 100644
new mode 100755
diff --git a/src/a2pid.c b/src/a2pid.c
old mode 100644
new mode 100755
index 54889d0..9fe77ce
--- a/src/a2pid.c
+++ b/src/a2pid.c
@@ -216,16 +216,16 @@ int keycode[256] = {
         MOD_CTRL |             KEY_6,           // CTRL-6 code 1E
         MOD_CTRL |             KEY_MINUS,       // CTRL-- code 1F
                                KEY_SPACE,       // ' '    code 20
-                   MOD_SHIFT | KEY_1,           // !      code 21
+		                       KEY_F11,         // !      code 21
                    MOD_SHIFT | KEY_APOSTROPHE,  // "      code 22
-                   MOD_SHIFT | KEY_3,           // #      code 23
-                   MOD_SHIFT | KEY_4,           // $      code 24
-                   MOD_SHIFT | KEY_5,           // %      code 25
-                   MOD_SHIFT | KEY_7,           // &      code 26
+			                   KEY_F13,         // #      code 23
+                               KEY_F14,         // $      code 24
+							   KEY_F15,         // %      code 25
+							   KEY_F17,         // &      code 26
                                KEY_APOSTROPHE,  // '      code 27
-                   MOD_SHIFT | KEY_9,           // (      code 28
-                   MOD_SHIFT | KEY_0,           // )      code 29
-                   MOD_SHIFT | KEY_8,           // *      code 2A
+                               KEY_F19,         // (      code 28
+                               KEY_F20,         // )      code 29
+                               KEY_F18,         // *      code 2A
                    MOD_SHIFT | KEY_EQUAL,       // +      code 2B
                                KEY_COMMA,       // ,      code 2C
                                KEY_MINUS,       // -      code 2D
@@ -247,7 +247,7 @@ int keycode[256] = {
                                KEY_EQUAL,       // =      code 3D
                    MOD_SHIFT | KEY_DOT,         // >      code 3E
                    MOD_SHIFT | KEY_SLASH,       // ?      code 3F
-                   MOD_SHIFT | KEY_2,           // @      code 40
+                               KEY_F12,         // @      code 40
                    MOD_SHIFT | KEY_A,           // A      code 41
                    MOD_SHIFT | KEY_B,           // B      code 42
                    MOD_SHIFT | KEY_C,           // C      code 43
@@ -277,7 +277,7 @@ int keycode[256] = {
                                KEY_LEFTBRACE,   // [      code 5B
                                KEY_BACKSLASH,   // \      code 5C
                                KEY_RIGHTBRACE,  // ]      code 5D
-                   MOD_SHIFT | KEY_6,           // ^      code 5E
+							   KEY_F16,         // ^      code 5E
                    MOD_SHIFT | KEY_MINUS,       // _      code 5F
                                KEY_GRAVE,       // `      code 60
                                KEY_A,           // a      code 61
@@ -418,6 +418,10 @@ void sendbttn(int fd, int mod, int bttn)
 }
 void sendrelxy(int fd, int x, int y)
 {
+		if (x > 4 || x < -4) x = x *4;
+		else x = accel[x & 0x1F];
+		if (y > 4 || y < -4) y = y * 4;
+		else y = accel[y & 0x1F];
         evrelx.value = x;
         evrely.value = y;
         write(fd, &evrelx, sizeof(evrelx));
@@ -740,7 +744,7 @@ void main(int argc, char **argv)
                         {
                                 if (read(a2fd, iopkt, 3) == 3)
                                 {
-                                        printf("a2pi: Event [0x%02X] [0x%02X] [0x%02X]\n", iopkt[0], iopkt[1], iopkt[2]);
+                                        // printf("a2pi: Event [0x%02X] [0x%02X] [0x%02X]\n", iopkt[0], iopkt[1], iopkt[2]);
                                         switch (iopkt[0])
                                         {
                                                 case 0x80: /* sync */
@@ -757,7 +761,7 @@ void main(int argc, char **argv)
                                                         break;
                                                 case 0x84: /* mouse move event */
                                                         // printf("Mouse XY Event: %d,%d\n", (signed char)iopkt[1], (signed char)iopkt[2]);
-                                                        sendrelxy(moufd, accel[iopkt[1] & 0x1F], accel[iopkt[2] & 0x1F]);
+                                                        sendrelxy(moufd, (signed char)iopkt[1], (signed char)iopkt[2]);
                                                         break;
                                                 case 0x86: /* mouse button event */
                                                         // printf("Mouse Button %s Event 0x%02X\n", iopkt[2] ? "[PRESS]" : "[RELEASE]", iopkt[1]);
diff --git a/src/a2serclk.c b/src/a2serclk.c
old mode 100644
new mode 100755
diff --git a/src/a2slideshow.mon b/src/a2slideshow.mon
old mode 100644
new mode 100755
diff --git a/src/bintomon.c b/src/bintomon.c
old mode 100644
new mode 100755
diff --git a/src/dskread.c b/src/dskread.c
old mode 100644
new mode 100755
diff --git a/src/dskwrite.c b/src/dskwrite.c
old mode 100644
new mode 100755