diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
| commit | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (patch) | |
| tree | eec421a528cb2f0fdaff43d4cf82fc0af89c0392 /xorg-server/dix | |
| parent | 2553bdd7c359cd87525d367761c86932cec5adff (diff) | |
| download | vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.gz vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.bz2 vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.zip | |
vcxsrv compiles now. Still run-time errors.
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/getevents.c | 7 | ||||
| -rw-r--r-- | xorg-server/dix/makefile | 36 | ||||
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 9 | ||||
| -rw-r--r-- | xorg-server/dix/window.c | 5 |
4 files changed, 52 insertions, 5 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 9747b35a6..50a8f5690 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -112,6 +112,13 @@ key_autorepeats(DeviceIntPtr pDev, int key_code) (1 << (key_code & 7))); } +#ifdef _MSC_VER +float roundf(float f) +{ + return ((f<0.0f) ? ceil(f-.5) : floor (f+.5)); +} +#endif + /** * Rescale the coord between the two axis ranges. */ diff --git a/xorg-server/dix/makefile b/xorg-server/dix/makefile index 24afd2b94..f15ccd91a 100644 --- a/xorg-server/dix/makefile +++ b/xorg-server/dix/makefile @@ -1,8 +1,36 @@ DEFINES += FONTDEBUG
-CSRCS=atom.c colormap.c cursor.c deprecated.c devices.c dispatch.c dix.c dixfonts.c dixutils.c events.c extension.c ffs.c gc.c \
-getevents.c globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c privates.c property.c registry.c resource.c selection.c \
-strcasecmp.c strcasestr.c swaprep.c swapreq.c tables.c window.c xpstubs.c
-
LIBRARY=libdix
+CSRCS=\
+ atom.c \
+ colormap.c \
+ cursor.c \
+ deprecated.c \
+ devices.c \
+ dispatch.c \
+ dixfonts.c \
+ dixutils.c \
+ enterleave.c \
+ events.c \
+ extension.c \
+ ffs.c \
+ gc.c \
+ getevents.c \
+ globals.c \
+ glyphcurs.c \
+ grabs.c \
+ initatoms.c \
+ main.c \
+ pixmap.c \
+ privates.c \
+ property.c \
+ ptrveloc.c \
+ registry.c \
+ resource.c \
+ selection.c \
+ swaprep.c \
+ swapreq.c \
+ tables.c \
+ window.c
+
diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index e9d4e882f..58b6a81da 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -26,12 +26,17 @@ #include <dix-config.h> #endif +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif + #include <math.h> #include <ptrveloc.h> #include <inputstr.h> #include <assert.h> #include <os.h> + /***************************************************************************** * Predictable pointer acceleration * @@ -58,6 +63,10 @@ * ****************************************************************************/ +#ifdef _MSC_VER +#define inline __inline +#endif + /* fwds */ static inline void FeedFilterStage(FilterStagePtr s, float value, int tdiff); diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index c19990ac1..03ef09ac4 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -3087,11 +3087,14 @@ NotClippedByChildren(WindowPtr pWin) void SendVisibilityNotify(WindowPtr pWin) { +#ifndef NO_XINERAMA_PORT + unsigned int visibility; +#endif xEvent event; if (!MapUnmapEventsEnabled(pWin)) return; #ifndef NO_XINERAMA_PORT - unsigned int visibility = pWin->visibility; + visibility = pWin->visibility; #endif #ifdef PANORAMIX /* This is not quite correct yet, but it's close */ |