summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/kdrive/ati/ChangeLog5
-rw-r--r--hw/kdrive/ati/ati_video.c3
-rw-r--r--hw/kdrive/chips/chipsdraw.c1
-rw-r--r--hw/kdrive/ephyr/hostx.c6
-rw-r--r--hw/kdrive/epson/epson13806draw.c1
-rw-r--r--hw/kdrive/i810/i810draw.c1
-rw-r--r--hw/kdrive/mach64/mach64draw.c1
-rw-r--r--hw/kdrive/neomagic/ChangeLog5
-rw-r--r--hw/kdrive/neomagic/neo_draw.c1
-rw-r--r--hw/kdrive/nvidia/nvidiadraw.c1
-rw-r--r--hw/kdrive/smi/smidraw.c1
-rw-r--r--hw/kdrive/src/kaa.c1
-rw-r--r--hw/kdrive/src/kinput.c6
13 files changed, 25 insertions, 8 deletions
diff --git a/hw/kdrive/ati/ChangeLog b/hw/kdrive/ati/ChangeLog
index db28ac59c..26001d9c5 100644
--- a/hw/kdrive/ati/ChangeLog
+++ b/hw/kdrive/ati/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-07 Keith Packard <keithp@keithp.com>
+
+ * ati_video.c: (RadeonDisplayVideo):
+ Build with modular X libraries and headers
+
2005-06-09 Eric Anholt <anholt@FreeBSD.org>
* ati.h:
diff --git a/hw/kdrive/ati/ati_video.c b/hw/kdrive/ati/ati_video.c
index 3ba1d8ef7..96c0b99d6 100644
--- a/hw/kdrive/ati/ati_video.c
+++ b/hw/kdrive/ati/ati_video.c
@@ -393,6 +393,7 @@ RadeonDisplayVideo(KdScreenInfo *screen, ATIPortPrivPtr pPortPriv)
END_DMA();
} else {
+// BEGIN_DMA(11);
BEGIN_DMA(9);
OUT_RING(DMA_PACKET0(RADEON_REG_PP_TXFILTER_0, 5));
@@ -421,6 +422,8 @@ RadeonDisplayVideo(KdScreenInfo *screen, ATIPortPrivPtr pPortPriv)
OUT_RING_REG(RADEON_REG_PP_TEX_PITCH_0,
pPortPriv->src_pitch - 32);
+// OUT_RING_REG(ATI_REG_WAIT_UNTIL, ATI_WAIT_CRTC_VLINE);
+
END_DMA();
}
diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c
index 536453d8f..554a3f0c6 100644
--- a/hw/kdrive/chips/chipsdraw.c
+++ b/hw/kdrive/chips/chipsdraw.c
@@ -34,7 +34,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 3f38b4512..ca04c8bea 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -521,9 +521,15 @@ hostx_screen_init (int width, int height)
/* Ask the WM to keep our size static */
size_hints = XAllocSizeHints();
+#if 0
size_hints->max_width = size_hints->min_width = width;
size_hints->max_height = size_hints->min_height = height;
size_hints->flags = PMinSize|PMaxSize;
+#else
+ size_hints->min_width = 100;
+ size_hints->min_height = 100;
+ size_hints->flags = PMinSize;
+#endif
XSetWMNormalHints(HostX.dpy, HostX.win, size_hints);
XFree(size_hints);
diff --git a/hw/kdrive/epson/epson13806draw.c b/hw/kdrive/epson/epson13806draw.c
index 15c07025d..e16e0d6a2 100644
--- a/hw/kdrive/epson/epson13806draw.c
+++ b/hw/kdrive/epson/epson13806draw.c
@@ -40,7 +40,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/i810/i810draw.c b/hw/kdrive/i810/i810draw.c
index deff7c204..a71e7a432 100644
--- a/hw/kdrive/i810/i810draw.c
+++ b/hw/kdrive/i810/i810draw.c
@@ -52,7 +52,6 @@ X Window System is a trademark of The Open Group */
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c
index 4fd5f4a3f..080904efe 100644
--- a/hw/kdrive/mach64/mach64draw.c
+++ b/hw/kdrive/mach64/mach64draw.c
@@ -35,7 +35,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/neomagic/ChangeLog b/hw/kdrive/neomagic/ChangeLog
index 54892bb58..20724d66c 100644
--- a/hw/kdrive/neomagic/ChangeLog
+++ b/hw/kdrive/neomagic/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-07 Keith Packard <keithp@keithp.com>
+
+ * neo_draw.c:
+ Build with modular X libraries and headers
+
2005-06-09 Eric Anholt <anholt@FreeBSD.org>
* neo_draw.c:
diff --git a/hw/kdrive/neomagic/neo_draw.c b/hw/kdrive/neomagic/neo_draw.c
index 649d60ec0..be0d39a84 100644
--- a/hw/kdrive/neomagic/neo_draw.c
+++ b/hw/kdrive/neomagic/neo_draw.c
@@ -32,7 +32,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/nvidia/nvidiadraw.c b/hw/kdrive/nvidia/nvidiadraw.c
index 8901e3707..9fa9459b1 100644
--- a/hw/kdrive/nvidia/nvidiadraw.c
+++ b/hw/kdrive/nvidia/nvidiadraw.c
@@ -34,7 +34,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c
index a85382816..7f7ef4ca8 100644
--- a/hw/kdrive/smi/smidraw.c
+++ b/hw/kdrive/smi/smidraw.c
@@ -35,7 +35,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index 559f4f5b4..36406f270 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -29,7 +29,6 @@
#endif
#include "kdrive.h"
#include "kaa.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#define DEBUG_MIGRATE 0
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 1fc6e71d1..a34350a6a 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1373,6 +1373,7 @@ KdMouseAccelerate (DeviceIntPtr device, int *dx, int *dy)
PtrCtrl *pCtrl = &device->ptrfeed->ctrl;
double speed = sqrt (*dx * *dx + *dy * *dy);
double accel;
+#ifdef QUADRATIC_ACCELERATION
double m;
/*
@@ -1389,6 +1390,11 @@ KdMouseAccelerate (DeviceIntPtr device, int *dx, int *dy)
m = (((double) pCtrl->num / (double) pCtrl->den - 1.0) /
((double) pCtrl->threshold * 2.0));
accel = m * speed + 1;
+#else
+ accel = 1.0;
+ if (speed > pCtrl->threshold)
+ accel = (double) pCtrl->num / pCtrl->den;
+#endif
*dx = accel * *dx;
*dy = accel * *dy;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 18:21:35 +0000