From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 8 Mar 2003 18:28:14 +0000 (+0000)
Subject: DOS update (Daniel Borca)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47d8adde43c71f32d3677bb8ad965f262b6f3150;p=mesa.git

DOS update (Daniel Borca)
---

diff --git a/docs/README.DJ b/docs/README.DJ
index 13167611ba0..a800d6eb958 100644
--- a/docs/README.DJ
+++ b/docs/README.DJ
@@ -1,12 +1,12 @@
-			Mesa 5.0 DOS/DJGPP Port v1.3
-			~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			Mesa 5.0.1 DOS/DJGPP Port v1.3
+			~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 
 Description:
 ~~~~~~~~~~~~
 
-Well, guess what... this is the DOS port of Mesa 5.0, for DJGPP fans... Whoa!
+Well, guess what... this is the DOS port of Mesa 5.0.1, for DJGPP fans... Whoa!
 The driver has its origins in ddsample.c, written by Brian Paul and found by me
 in Mesa 3.4.2.
 
@@ -165,8 +165,8 @@ space (and since dynamic modules shall) the SIGINT can't be hooked (well, it
 can, but it is useless), therefore you must live with the 'Exiting due to
 signal SIGINT' message...
 
-The mouse driver is far from complete (lack of positioning, drawing, etc), but
-is enough to make almost all the demos work.
+The mouse driver is far from complete (lack of drawing, etc), but is enough to
+make almost all the demos work. Supports the CuteMouse WheelAPI.
 
 The timer is pretty versatile for it supports multiple timers with different
 frequencies. While not being the most accurate timer in the known universe, I
@@ -207,7 +207,7 @@ v1.2 (nov-2002)
 	* synced w/ Mesa-4.1
 	- removed dmesadxe.h
 
-v1.3 (feb-2003)
+v1.3 (mar-2003)
 	+ enabled OpenGL 1.4 support
 	+ added MMX clear/blit routines
 	+ enabled SGI's GLU compilation
diff --git a/include/GL/dmesa.h b/include/GL/dmesa.h
index 2c0ef81abe2..89df5a4e216 100644
--- a/include/GL/dmesa.h
+++ b/include/GL/dmesa.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/progs/samples/Makefile.DJ b/progs/samples/Makefile.DJ
index 3d679ebe7c6..81db8253426 100644
--- a/progs/samples/Makefile.DJ
+++ b/progs/samples/Makefile.DJ
@@ -20,7 +20,7 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP samples makefile v1.3 for Mesa 5.0
+# DOS/DJGPP samples makefile v1.3 for Mesa
 #
 #  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@yahoo.com
@@ -63,6 +63,7 @@ CFLAGS = -Wall -W -pedantic
 CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
 CFLAGS += -I$(TOP)/include
 
+LD = gxx
 LDFLAGS = -s -L$(TOP)/lib
 
 ifeq ($(DXE),1)
@@ -79,7 +80,7 @@ endif
 .c.o:
 	$(CC) -o $@ $(CFLAGS) -c $<
 .o.exe:
-	$(CC) -o $@ $(LDFLAGS) $(DMESADXE) $< $(LDLIBS)
+	$(LD) -o $@ $(LDFLAGS) $(DMESADXE) $< $(LDLIBS)
 
 all:
 	$(error Must specify <filename.exe> to build)
diff --git a/src/glu/mesa/Makefile.DJ b/src/glu/mesa/Makefile.DJ
index 6c8ec1bd5d4..e4423ccad08 100644
--- a/src/glu/mesa/Makefile.DJ
+++ b/src/glu/mesa/Makefile.DJ
@@ -20,7 +20,7 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP glu makefile v1.3 for Mesa 5.0
+# DOS/DJGPP glu makefile v1.3 for Mesa
 #
 #  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@yahoo.com
diff --git a/src/glu/sgi/Makefile.DJ b/src/glu/sgi/Makefile.DJ
index 6f4bcd81c09..0f0984fb6c9 100644
--- a/src/glu/sgi/Makefile.DJ
+++ b/src/glu/sgi/Makefile.DJ
@@ -20,7 +20,7 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP glu makefile v1.3 for Mesa 5.0
+# DOS/DJGPP glu makefile v1.3 for Mesa
 #
 #  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@yahoo.com
diff --git a/src/glut/dos/Makefile.DJ b/src/glut/dos/Makefile.DJ
index 2fb1bee27d7..2ae88520dc3 100644
--- a/src/glut/dos/Makefile.DJ
+++ b/src/glut/dos/Makefile.DJ
@@ -20,7 +20,7 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP glut makefile v1.3 for Mesa 5.0
+# DOS/DJGPP glut makefile v1.3 for Mesa
 #
 #  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@yahoo.com
diff --git a/src/glut/dos/PC_HW/pc_hw.h b/src/glut/dos/PC_HW/pc_hw.h
index c38c8959b6c..c029005b53c 100644
--- a/src/glut/dos/PC_HW/pc_hw.h
+++ b/src/glut/dos/PC_HW/pc_hw.h
@@ -25,7 +25,7 @@
 
 typedef void (*VFUNC) (void);
 typedef void (*PFUNC) (void *);
-typedef void (*MFUNC) (int x, int y, int b);
+typedef void (*MFUNC) (int x, int y, int z, int b);
 
 /*
  * atexit
@@ -211,7 +211,8 @@ void pc_remove_mouse (void);
 MFUNC pc_install_mouse_handler (MFUNC handler);
 void pc_mouse_area (int x1, int y1, int x2, int y2);
 void pc_mouse_speed (int xspeed, int yspeed);
-int pc_query_mouse (int *x, int *y);
+int pc_query_mouse (int *x, int *y, int *z);
+void pc_warp_mouse (int x, int y);
 
 /*
  * standard redirection
diff --git a/src/glut/dos/PC_HW/pc_irq.S b/src/glut/dos/PC_HW/pc_irq.S
index 196546072cc..7f0b747d342 100644
--- a/src/glut/dos/PC_HW/pc_irq.S
+++ b/src/glut/dos/PC_HW/pc_irq.S
@@ -1,5 +1,5 @@
 /*
- * PC/HW routine collection v1.0 for DOS/DJGPP
+ * PC/HW routine collection v1.3 for DOS/DJGPP
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
@@ -74,6 +74,9 @@ _pc_install_irq:
 		addl	%edx, %eax
 		movl	%eax, IRQ_STACK(%edi)
 
+		movl	___djgpp_ds_alias, %eax
+		movl	%eax, IRQ_STACK+4(%edi)
+
 		movl	%ss:12(%ebp), %eax
 		movl	%eax, IRQ_HOOK(%edi)
 
@@ -131,8 +134,7 @@ __irq_wrapper_##x:							   ; \
 		pushl	%gs						   ; \
 		movl	%ss, %ebx					   ; \
 		movl	%esp, %esi					   ; \
-		movl	%cs:___djgpp_ds_alias, %ss			   ; \
-		movl	%cs:__irq_stack_##x, %esp			   ; \
+		lss	%cs:__irq_stack_##x, %esp			   ; \
 		pushl	%ss						   ; \
 		pushl	%ss						   ; \
 		popl	%es						   ; \
@@ -160,7 +162,7 @@ __irq_old_##x:								   ; \
 __irq_hook_##x:								   ; \
 		.long	0						   ; \
 __irq_stack_##x:							   ; \
-		.long	0
+		.long	0, 0
 
 		WRAPPER(0);
 		WRAPPER(1);
diff --git a/src/glut/dos/PC_HW/pc_keyb.c b/src/glut/dos/PC_HW/pc_keyb.c
index 333ca757f50..6475be35086 100644
--- a/src/glut/dos/PC_HW/pc_keyb.c
+++ b/src/glut/dos/PC_HW/pc_keyb.c
@@ -357,20 +357,6 @@ static void handle_code (int scancode, int keycode)
  in_a_terrupt--;
 } ENDOFUNC(handle_code)
 
-static __inline void satisfy (void)
-{
- __asm("\n\
-		inb	$0x61, %%al	\n\
-		movb	%%al, %%ah	\n\
-		orb	$0x80, %%al	\n\
-		outb	%%al, $0x61	\n\
-		xchgb	%%al, %%ah	\n\
-		outb	%%al, $0x61	\n\
-		movb	$0x20, %%al	\n\
-		outb	%%al, $0x20	\n\
- ":::"%eax");
-}
-
 static int keyboard ()
 {
  unsigned char temp, scancode;
@@ -410,7 +396,16 @@ static int keyboard ()
     ":::"%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
  }
 
- satisfy();
+ __asm("\n\
+		inb	$0x61, %%al	\n\
+		movb	%%al, %%ah	\n\
+		orb	$0x80, %%al	\n\
+		outb	%%al, $0x61	\n\
+		xchgb	%%al, %%ah	\n\
+		outb	%%al, $0x61	\n\
+		movb	$0x20, %%al	\n\
+		outb	%%al, $0x20	\n\
+ ":::"%eax");
  return 0;
 } ENDOFUNC(keyboard)
 
diff --git a/src/glut/dos/PC_HW/pc_mouse.c b/src/glut/dos/PC_HW/pc_mouse.c
index 3ed76509067..1740bfbac43 100644
--- a/src/glut/dos/PC_HW/pc_mouse.c
+++ b/src/glut/dos/PC_HW/pc_mouse.c
@@ -8,11 +8,15 @@
 
 
 #include <dpmi.h>
+#include <sys/exceptn.h>
+#include <sys/segments.h>
 
 #include "pc_hw.h"
 
 
 
+#define PC_CUTE_WHEEL 1 /* CuteMouse WheelAPI */
+
 #define MOUSE_STACK_SIZE 16384
 
 #define CLEAR_MICKEYS() \
@@ -21,20 +25,23 @@
             ox = oy = 0; \
         } while (0)
 
-extern void mouse_wrapper (void);
-extern void mouse_wrapper_end (void);
+extern void mouse_wrap (void);
+extern int mouse_wrap_end[];
 
 static MFUNC mouse_func;
-static void *mouse_stack;
 static long mouse_callback;
 static __dpmi_regs mouse_regs;
 
-static volatile int pc_mouse_x, pc_mouse_y, pc_mouse_b;
+static volatile struct {
+       volatile int x, y, z, b;
+} pc_mouse;
 
 static int minx = 0;
 static int maxx = 319;
 static int miny = 0;
 static int maxy = 199;
+static int minz = 0;
+static int maxz = 255;
 
 static int sx = 2;
 static int sy = 2;
@@ -43,27 +50,34 @@ static int emulat3 = FALSE;
 
 static int ox, oy;
 
+
 static void mouse (__dpmi_regs *r)
 {
  int nx = (signed short)r->x.si / sx;
  int ny = (signed short)r->x.di / sy;
  int dx = nx - ox;
  int dy = ny - oy;
+#if PC_CUTE_WHEEL
+ int dz = (signed char)r->h.bh;
+#endif
  ox = nx;
  oy = ny;
 
- pc_mouse_b = r->x.bx;
- pc_mouse_x = MID(minx, pc_mouse_x + dx, maxx);
- pc_mouse_y = MID(miny, pc_mouse_y + dy, maxy);
+ pc_mouse.b = r->h.bl;
+ pc_mouse.x = MID(minx, pc_mouse.x + dx, maxx);
+ pc_mouse.y = MID(miny, pc_mouse.y + dy, maxy);
+#if PC_CUTE_WHEEL
+ pc_mouse.z = MID(minz, pc_mouse.z + dz, maxz);
+#endif
 
  if (emulat3) {
-    if ((pc_mouse_b&3)==3) {
-       pc_mouse_b = 4;
+    if ((pc_mouse.b&3)==3) {
+       pc_mouse.b = 4;
     }
  }
 
  if (mouse_func) {
-    mouse_func(pc_mouse_x, pc_mouse_y, pc_mouse_b);
+    mouse_func(pc_mouse.x, pc_mouse.y, pc_mouse.z, pc_mouse.b);
  }
 } ENDOFUNC(mouse)
 
@@ -83,7 +97,7 @@ void pc_remove_mouse (void)
 
     mouse_callback = 0;
 
-    free((void *)((unsigned long)mouse_stack-MOUSE_STACK_SIZE));
+    free((void *)(mouse_wrap_end[0] - MOUSE_STACK_SIZE));
  }
 }
 
@@ -109,26 +123,26 @@ int pc_install_mouse (void)
 
  /* lock wrapper */
  LOCKDATA(mouse_func);
- LOCKDATA(mouse_stack);
  LOCKDATA(mouse_callback);
  LOCKDATA(mouse_regs);
- LOCKDATA(pc_mouse_x);
- LOCKDATA(pc_mouse_y);
- LOCKDATA(pc_mouse_b);
+ LOCKDATA(pc_mouse);
  LOCKDATA(minx);
  LOCKDATA(maxx);
  LOCKDATA(miny);
  LOCKDATA(maxy);
+ LOCKDATA(minz);
+ LOCKDATA(maxz);
  LOCKDATA(sx);
  LOCKDATA(sy);
  LOCKDATA(emulat3);
  LOCKDATA(ox);
  LOCKDATA(oy);
  LOCKFUNC(mouse);
- LOCKFUNC(mouse_wrapper);
+ LOCKFUNC(mouse_wrap);
 
+ mouse_wrap_end[1] = __djgpp_ds_alias;
  /* grab a locked stack */
- if ((mouse_stack=pc_malloc(MOUSE_STACK_SIZE))==NULL) {
+ if ((mouse_wrap_end[0] = (int)pc_malloc(MOUSE_STACK_SIZE)) == NULL) {
     return 0;
  }
 
@@ -150,19 +164,23 @@ int pc_install_mouse (void)
 		movl	%%ecx, %0	\n\
 	0:				\n\
  ":"=g"(mouse_callback)
-  :"S" (mouse_wrapper), "D"(&mouse_regs)
+  :"S" (mouse_wrap), "D"(&mouse_regs)
   :"%eax", "%ecx", "%edx");
  if (!mouse_callback) {
-    free(mouse_stack);
+    free((void *)mouse_wrap_end[0]);
     return 0;
  }
 
  /* adjust stack */
- mouse_stack = (void *)((unsigned long)mouse_stack + MOUSE_STACK_SIZE);
+ mouse_wrap_end[0] += MOUSE_STACK_SIZE;
 
  /* install the handler */
  mouse_regs.x.ax = 0x000c;
- mouse_regs.x.cx = 0x007f;
+#if PC_CUTE_WHEEL
+ mouse_regs.x.cx = 0x7f | 0x80;
+#else
+ mouse_regs.x.cx = 0x7f;
+#endif
  mouse_regs.x.dx = mouse_callback&0xffff;
  mouse_regs.x.es = mouse_callback>>16;
  __dpmi_int(0x33, &mouse_regs);
@@ -205,41 +223,57 @@ void pc_mouse_speed (int xspeed, int yspeed)
  ENABLE();
 }
 
-int pc_query_mouse (int *x, int *y)
+int pc_query_mouse (int *x, int *y, int *z)
 {
- *x = pc_mouse_x;
- *y = pc_mouse_y;
- return pc_mouse_b;
+ *x = pc_mouse.x;
+ *y = pc_mouse.y;
+ *z = pc_mouse.z;
+ return pc_mouse.b;
 }
 
+void pc_warp_mouse (int x, int y)
+{
+ CLEAR_MICKEYS();
+
+ pc_mouse.x = MID(minx, x, maxx);
+ pc_mouse.y = MID(miny, y, maxy);
+
+ if (mouse_func) {
+    mouse_func(pc_mouse.x, pc_mouse.y, pc_mouse.z, pc_mouse.b);
+ }
+}
+
+/* Hack alert:
+ * `mouse_wrap_end' actually holds the
+ * address of stack in a safe data selector.
+ */
 __asm("\n\
-		.text					\n\
-		.p2align 5,,31				\n\
-		.global	_mouse_wrapper			\n\
-_mouse_wrapper:						\n\
-		cld					\n\
-		lodsl					\n\
-		movl	%eax, %es:42(%edi)		\n\
-		addw	$4, %es:46(%edi)		\n\
-		pushl	%es				\n\
-		movl	%ss, %ebx			\n\
-		movl	%esp, %esi			\n\
-		movl	%cs:___djgpp_ds_alias, %ss	\n\
-		movl	%cs:_mouse_stack, %esp		\n\
-		pushl	%ss				\n\
-		pushl	%ss				\n\
-		popl	%es				\n\
-		popl	%ds				\n\
-		movl	___djgpp_dos_sel, %fs		\n\
-		pushl	%fs				\n\
-		popl	%gs				\n\
-		pushl	%edi				\n\
-		call	_mouse				\n\
-		popl	%edi				\n\
-		movl	%ebx, %ss			\n\
-		movl	%esi, %esp			\n\
-		popl	%es				\n\
-		iret					\n\
-		.balign	4				\n\
-		.global	_mouse_wrapper_end		\n\
-_mouse_wrapper_end:");
+		.text				\n\
+		.p2align 5,,31			\n\
+		.global	_mouse_wrap		\n\
+_mouse_wrap:					\n\
+		cld				\n\
+		lodsl				\n\
+		movl	%eax, %es:42(%edi)	\n\
+		addw	$4, %es:46(%edi)	\n\
+		pushl	%es			\n\
+		movl	%ss, %ebx		\n\
+		movl	%esp, %esi		\n\
+		lss	%cs:_mouse_wrap_end, %esp\n\
+		pushl	%ss			\n\
+		pushl	%ss			\n\
+		popl	%es			\n\
+		popl	%ds			\n\
+		movl	___djgpp_dos_sel, %fs	\n\
+		pushl	%fs			\n\
+		popl	%gs			\n\
+		pushl	%edi			\n\
+		call	_mouse			\n\
+		popl	%edi			\n\
+		movl	%ebx, %ss		\n\
+		movl	%esi, %esp		\n\
+		popl	%es			\n\
+		iret				\n\
+		.balign	4			\n\
+		.global	_mouse_wrap_end		\n\
+_mouse_wrap_end:.long	0, 0");
diff --git a/src/glut/dos/callback.c b/src/glut/dos/callback.c
index 6e3f5a77c78..67e52ee59f0 100644
--- a/src/glut/dos/callback.c
+++ b/src/glut/dos/callback.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/color.c b/src/glut/dos/color.c
index 2e8ed3f95bf..490839968ec 100644
--- a/src/glut/dos/color.c
+++ b/src/glut/dos/color.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/extens.c b/src/glut/dos/extens.c
index ae8e44f4088..ca4da058cd0 100644
--- a/src/glut/dos/extens.c
+++ b/src/glut/dos/extens.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/glutint.h b/src/glut/dos/glutint.h
index bbabf0fdb2c..dfc42754df8 100644
--- a/src/glut/dos/glutint.h
+++ b/src/glut/dos/glutint.h
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/init.c b/src/glut/dos/init.c
index 6c034ff5e2b..9553cf2532e 100644
--- a/src/glut/dos/init.c
+++ b/src/glut/dos/init.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
@@ -152,10 +152,11 @@ void APIENTRY glutMainLoop (void)
        if (g_mouse) {
           int mouse_x;
           int mouse_y;
+          int mouse_z;
           int mouse_b;
 
           /* query mouse */
-          mouse_b = pc_query_mouse(&mouse_x, &mouse_y);
+          mouse_b = pc_query_mouse(&mouse_x, &mouse_y, &mouse_z);
 
           /* relative to window coordinates */
           g_mouse_x = mouse_x - g_curwin->xpos;
diff --git a/src/glut/dos/menu.c b/src/glut/dos/menu.c
index 9a3841b12b6..e8f7b0a75b0 100644
--- a/src/glut/dos/menu.c
+++ b/src/glut/dos/menu.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/mouse.c b/src/glut/dos/mouse.c
index d82f5e8a8c8..7ba6358bc26 100644
--- a/src/glut/dos/mouse.c
+++ b/src/glut/dos/mouse.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
@@ -44,3 +44,17 @@ void __glutInitMouse (void)
     g_curwin->show_mouse = (g_curwin->mouse || g_curwin->motion || g_curwin->passive);
  }
 }
+
+
+
+void APIENTRY glutSetCursor (int cursor)
+{
+ /* XXX completely futile until full mouse support (maybe never) */
+}
+
+
+
+void APIENTRY glutWarpPointer (int x, int y)
+{
+ pc_warp_mouse(x, y);
+}
diff --git a/src/glut/dos/overlay.c b/src/glut/dos/overlay.c
index f1f72cf1f83..d0e2a859c7b 100644
--- a/src/glut/dos/overlay.c
+++ b/src/glut/dos/overlay.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/state.c b/src/glut/dos/state.c
index e9735a06a2a..38b03a72ab5 100644
--- a/src/glut/dos/state.c
+++ b/src/glut/dos/state.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/glut/dos/window.c b/src/glut/dos/window.c
index cad4726936f..839241a9b09 100644
--- a/src/glut/dos/window.c
+++ b/src/glut/dos/window.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * DOS/DJGPP glut driver v1.3 for Mesa 5.0
+ * DOS/DJGPP glut driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/blit.S b/src/mesa/drivers/dos/blit.S
index 3598614c9f1..7d0da5da289 100644
--- a/src/mesa/drivers/dos/blit.S
+++ b/src/mesa/drivers/dos/blit.S
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index 5202bbd6b17..d3d3d4abcb7 100644
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  5.0
  * 
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
@@ -39,6 +39,7 @@
 #include "extensions.h"
 #include "macros.h"
 #include "matrix.h"
+#include "mmath.h"
 #include "texformat.h"
 #include "texstore.h"
 #include "array_cache/acache.h"
@@ -1099,7 +1100,7 @@ static const GLubyte* get_string (GLcontext *ctx, GLenum name)
                                      #ifdef MATROX
                                      " (MGA)"
                                      #endif
-                                     "\0port (c) Borca Daniel feb-2003";
+                                     "\0port (c) Borca Daniel mar-2003";
         default:
              return NULL;
  }
diff --git a/src/mesa/drivers/dos/dpmi.c b/src/mesa/drivers/dos/dpmi.c
index db6a3063390..17c005a9e58 100644
--- a/src/mesa/drivers/dos/dpmi.c
+++ b/src/mesa/drivers/dos/dpmi.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/internal.h b/src/mesa/drivers/dos/internal.h
index f6dc0e4b41f..6860ef35840 100644
--- a/src/mesa/drivers/dos/internal.h
+++ b/src/mesa/drivers/dos/internal.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
@@ -34,7 +34,7 @@
 #ifndef INTERNAL_H_included
 #define INTERNAL_H_included
 
-#include "../macros.h"
+#include "../mmath.h"
 
 /*
  * general purpose defines, etc.
diff --git a/src/mesa/drivers/dos/mga/m_ttemp.h b/src/mesa/drivers/dos/mga/m_ttemp.h
index d3de69a825a..1c5fbda29af 100644
--- a/src/mesa/drivers/dos/mga/m_ttemp.h
+++ b/src/mesa/drivers/dos/mga/m_ttemp.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W triangle template
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W triangle template
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/m_ttemp2.h b/src/mesa/drivers/dos/mga/m_ttemp2.h
index 27a1c8ba037..2933f2b1a95 100644
--- a/src/mesa/drivers/dos/mga/m_ttemp2.h
+++ b/src/mesa/drivers/dos/mga/m_ttemp2.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W triangle template
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W triangle template
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga.c b/src/mesa/drivers/dos/mga/mga.c
index 59bb09c9d3d..27afba0ba04 100644
--- a/src/mesa/drivers/dos/mga/mga.c
+++ b/src/mesa/drivers/dos/mga/mga.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga.h b/src/mesa/drivers/dos/mga/mga.h
index fc5722b0314..d84fe72e269 100644
--- a/src/mesa/drivers/dos/mga/mga.h
+++ b/src/mesa/drivers/dos/mga/mga.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga_hw.c b/src/mesa/drivers/dos/mga/mga_hw.c
index 4354ce86155..08c1d7e54a4 100644
--- a/src/mesa/drivers/dos/mga/mga_hw.c
+++ b/src/mesa/drivers/dos/mga/mga_hw.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W HW mapping
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W HW mapping
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga_hw.h b/src/mesa/drivers/dos/mga/mga_hw.h
index 246ed9c6ad7..c6575b97f88 100644
--- a/src/mesa/drivers/dos/mga/mga_hw.h
+++ b/src/mesa/drivers/dos/mga/mga_hw.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W HW mapping
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W HW mapping
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga_mode.c b/src/mesa/drivers/dos/mga/mga_mode.c
index 33f47a6486e..4c6d926111d 100644
--- a/src/mesa/drivers/dos/mga/mga_mode.c
+++ b/src/mesa/drivers/dos/mga/mga_mode.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W mode switching
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W mode switching
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga_mode.h b/src/mesa/drivers/dos/mga/mga_mode.h
index 4049bd8fd2d..b458d00d802 100644
--- a/src/mesa/drivers/dos/mga/mga_mode.h
+++ b/src/mesa/drivers/dos/mga/mga_mode.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W mode switching
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W mode switching
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/mga/mga_reg.h b/src/mesa/drivers/dos/mga/mga_reg.h
index 73d22de2b87..4cd664ff967 100644
--- a/src/mesa/drivers/dos/mga/mga_reg.h
+++ b/src/mesa/drivers/dos/mga/mga_reg.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0  --  MGA2064W register mnemonics
+ * DOS/DJGPP device driver v1.3 for Mesa  --  MGA2064W register mnemonics
  *
  *  Copyright (c) 2003 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/vesa.c b/src/mesa/drivers/dos/vesa.c
index eebaa5006b9..cb8c29dfc71 100644
--- a/src/mesa/drivers/dos/vesa.c
+++ b/src/mesa/drivers/dos/vesa.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/vesa.h b/src/mesa/drivers/dos/vesa.h
index 369196f1443..030c816f080 100644
--- a/src/mesa/drivers/dos/vesa.h
+++ b/src/mesa/drivers/dos/vesa.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/vga.c b/src/mesa/drivers/dos/vga.c
index ed899628405..4fe8773243f 100644
--- a/src/mesa/drivers/dos/vga.c
+++ b/src/mesa/drivers/dos/vga.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/vga.h b/src/mesa/drivers/dos/vga.h
index d1047940418..f1bc62bbe73 100644
--- a/src/mesa/drivers/dos/vga.h
+++ b/src/mesa/drivers/dos/vga.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/video.c b/src/mesa/drivers/dos/video.c
index 3e93e6095a8..297c9d56624 100644
--- a/src/mesa/drivers/dos/video.c
+++ b/src/mesa/drivers/dos/video.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/video.h b/src/mesa/drivers/dos/video.h
index e908178ad4d..bb40fd00dfb 100644
--- a/src/mesa/drivers/dos/video.h
+++ b/src/mesa/drivers/dos/video.h
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/drivers/dos/virtual.S b/src/mesa/drivers/dos/virtual.S
index 0605514b14a..0df584150f3 100644
--- a/src/mesa/drivers/dos/virtual.S
+++ b/src/mesa/drivers/dos/virtual.S
@@ -23,7 +23,7 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.3 for Mesa 5.0
+ * DOS/DJGPP device driver v1.3 for Mesa
  *
  *  Copyright (C) 2002 - Borca Daniel
  *  Email : dborca@yahoo.com
diff --git a/src/mesa/main/Makefile.DJ b/src/mesa/main/Makefile.DJ
index 2a3c6a79b7a..33e6ca5d448 100644
--- a/src/mesa/main/Makefile.DJ
+++ b/src/mesa/main/Makefile.DJ
@@ -20,7 +20,7 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# DOS/DJGPP core makefile v1.3 for Mesa 5.0
+# DOS/DJGPP core makefile v1.3 for Mesa
 #
 #  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@yahoo.com
@@ -130,6 +130,7 @@ CORE_SOURCES = \
 	light.c \
 	lines.c \
 	matrix.c \
+	mmath.c \
 	pixel.c \
 	points.c \
 	polygon.c \