Fix last cursor line not drawn, make mouse acceleration optional

Author: ghaerr

elkscmd/gui/cursor.c

@@ -18,8 +18,8 @@
 #include "mouse.h"
 #include "vgalib.h"
 
-#define USE_XOR_CURSOR      1       /* =1 use XOR drawing for slow systems*/
-#define USE_VGA_DRAWCURSOR  defined(__ia16__)
+#define USE_XOR_CURSOR      1       /* =1 use XOR drawpixel vs full cursor & mask draw */
+#define USE_VGA_DRAWCURSOR  (__ia16__ || __WATCOMC__)   /* VGA hardware XOR cursor */
 
 #define MWMAX_CURSOR_SIZE   16      /* maximum cursor x and y size*/
 #define MWMAX_CURSOR_BUFLEN MWIMAGE_SIZE(MWMAX_CURSOR_SIZE,MWMAX_CURSOR_SIZE)
@@ -150,6 +150,10 @@ static MWIMAGEBITS lgcursormask[16] = {
     MASK(_,_,_,_,_,_,_,_,_,_,_,_,X,X,X,_),  // 000E
     MASK(_,_,_,_,_,_,_,_,_,_,_,_,_,X,_,_)   // 0004
 };
+
+struct cursor cursor_lg = {
+    16, 16, 0, 0, WHITE, BLACK, lgcursorbits, lgcursormask
+};
 #else
 static MWIMAGEBITS lgcursorbits[16] = {
 //       8 4 2 1 8 4 2 1 8 4 2 1 8 4 2 1
@@ -189,10 +193,11 @@ static MWIMAGEBITS lgcursormask[16] = {
     MASK(X,X,_,_,X,X,X,X,_,_,_,_,_,_,_,_),
     MASK(X,_,_,_,_,X,X,X,_,_,_,_,_,_,_,_)
 };
-#endif
+
 struct cursor cursor_lg = {
     11, 16, 0, 0, WHITE, BLACK, lgcursorbits, lgcursormask
 };
+#endif
 
 void initcursor(void)
 {
@@ -288,7 +293,7 @@ int showcursor(void)
      * Loop through bits, resetting to firstbit at end of each row
      */
 #if USE_VGA_DRAWCURSOR
-    vga_drawcursor(curminx, curminy, curmaxy - curminy, cursormask);
+    vga_drawcursor(curminx, curminy, curmaxy - curminy + 1, cursormask);
 #elif USE_XOR_CURSOR
     set_op(0x18);
     for (y = curminy; y <= curmaxy; y++) {
@@ -365,7 +370,7 @@ int hidecursor(void)
         return prevcursor;
 
 #if USE_VGA_DRAWCURSOR
-    vga_drawcursor(cursavx, cursavy, cursavy2 - cursavy, cursormask);
+    vga_drawcursor(cursavx, cursavy, cursavy2 - cursavy + 1, cursormask);
 #elif USE_XOR_CURSOR
     set_op(0x18);
     for (y = cursavy; y <= cursavy2; y++) {

elkscmd/gui/graphics.c

@@ -105,14 +105,14 @@ void drawvline(int x, int y1, int y2, int c)
 #endif /* __WATCOMC__ */
 
 #if defined(__WATCOMC__) || defined(__ia16__)
-/* draw 8 bits horizontally using XOR amd one or two memory writes */
+/* draw 8 bits horizontally using XOR and one or two memory writes w/clipping */
 static void drawbits(int x, int y, unsigned char bits)
 {
     set_op(0x18);
     set_color(15);
     unsigned int dst = (y<<6) + (y<<4) + (x>>3);  /* y * 80 + x / 8 */
     if (x < SCREENWIDTH) {
-        set_mask(bits >> ((x & 7)));
+        set_mask(bits >> (x & 7));
         asm_orbyte(dst);
     }
     if (x < SCREENWIDTH-8) {

elkscmd/gui/mouse.c

@@ -24,6 +24,7 @@
 #define MOUSE_PC            0       /* pc/logitech mouse*/
 #define MOUSE_PS2           0       /* PS/2 mouse */
 
+#define USE_MOUSE_ACCEL     0       /* =1 to use mouse acceleration */
 #define SCALE       2               /* default scaling factor for acceleration */
 #define THRESH      5               /* default threshhold for acceleration */
 
@@ -168,6 +169,7 @@ void close_mouse(void)
     mouse_fd = -1;
 }
 
+#if USE_MOUSE_ACCEL
 static void
 filter_relative(int *xpos, int *ypos, int x, int y)
 {
@@ -196,6 +198,7 @@ filter_relative(int *xpos, int *ypos, int x, int y)
     *xpos = x;
     *ypos = y;
 }
+#endif
 
 #if MOUSE_PS2
 /* IntelliMouse PS/2 protocol uses four byte reports
@@ -290,7 +293,7 @@ int read_mouse(int *dx, int *dy, int *dz, int *bptr)
      */
     while (nbytes-- > 0) {
         if ((*parse)((int) *bp++)) {
-#if MOUSE_MICROSOFT
+#if USE_MOUSE_ACCEL && MOUSE_MICROSOFT
             filter_relative(&xd, &yd, xd, yd);
 #endif
             *dx = xd;