Commit Graph

185 Commits

Author SHA1 Message Date
Michel Dänzer
40f27a2df4 mieqEnqueue: Make local queue tail variables unsigned.
So the modulo arithmetic actually works as intended... thanks to Peter Hutterer
for pointing out the problem.
2007-06-19 09:11:16 +02:00
Eamon Walsh
e2a720c9a1 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/dixutils.c
2007-06-11 15:29:11 -04:00
Michel Dänzer
30a3297fed mieq queue handling cleanups.
In particular, fix handling of wraparounds in mieqEnqueue.
2007-06-11 09:23:18 +02:00
Eamon Walsh
2a4aa63a23 Merge branch 'master' into XACE-SELINUX
Conflicts:

	include/miscstruct.h
2007-05-22 14:50:26 -04:00
Soren Sandmann Pedersen
1568b6b6a0 Port large amounts of the region code to pixman 2007-05-15 11:13:16 -04:00
Soren Sandmann Pedersen
dde0ceac4e Add new InitRegions() function called from dix/main 2007-05-15 11:13:15 -04:00
Adam Jackson
a277f04ab0 Remove mfb and cfb from include paths where they're not needed. 2007-05-11 11:43:19 -04:00
Adam Jackson
20c5250e48 Use system copy of cbrt() if available.
Also move the replacement inline into miarc.c, since that's the only user.
2007-05-11 11:43:19 -04:00
Adam Jackson
8dcc37520d Use _X_INLINE instead of ad-hoc #defines. 2007-05-11 11:43:19 -04:00
Adam Jackson
6ff239cb4e Make the use of ICEIL slightly less ugly. 2007-05-11 11:43:19 -04:00
Keith Packard
806a537e64 Revert "Suppress software cursor removal during rotated shadow buffer drawing."
This reverts commit 999b681cf3.
Replacing this with simpler code that just disables SourceValidate
during rotation redisplay.
2007-04-19 17:49:34 -07:00
Eric Anholt
999b681cf3 Suppress software cursor removal during rotated shadow buffer drawing. 2007-04-18 14:33:27 -07:00
Eric Anholt
5d8e8a7f4b Remove libminimi build.
It appears to have been a leftover of a previous incarnation of the build
system that didn't handle miinitext.c well.
2007-04-18 13:22:26 -07:00
Eamon Walsh
1f06d32ef5 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/privates.c
2007-04-17 12:10:22 -04:00
Daniel Stone
e49f836d6f mieq: Use larger default queue size
Use a default queue size of 512 rather than 256, else Xephyr is too slow
without a host cursor, so events get stuck in the queue.
2007-04-10 23:58:20 +03:00
Stefan Huehner
1f6741db19 Bug #10560: Code-Cleanup: function declarations () -> (void)
X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560>
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
2007-04-09 14:33:15 -07:00
Eamon Walsh
0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -04:00
Adam Jackson
af769892a9 Static and dead code cleanup from mi/ 2007-03-25 17:56:32 -04:00
Adam Jackson
9a0f25de7c Static cleanups, dead code deletion. 2007-03-25 12:27:01 -04:00
Daniel Stone
80d29475b9 mieq: Allow event handlers for arbitrary events to be set
Allow arbitrary events to use mieq by letting custom handlers be set.
2007-03-21 00:10:38 +02:00
Peter Hutterer
4054834965 mi: remove 'register' keywords. 2007-03-09 14:16:23 +10:30
Eamon Walsh
23fc429aad Merge branch 'master' into XACE-SELINUX 2007-03-05 12:18:54 -05:00
Ben Byer
d287b76471 cleaned up some linking ugliness in hw/darwin/quartz 2007-02-17 03:47:42 -08:00
Ben Byer
cf4994b0db dix mods for Darwin 2007-02-17 01:21:43 -08:00
Peter Hutterer
37fe4c49dc mi: Move WarpPointer event generation to miPointerMove to avoid duplicate
events, cache event array allocation.
2007-02-16 09:57:57 +10:30
Eamon Walsh
04632835b7 Merge branch 'master' into my-XACE-SELINUX 2007-02-15 09:27:05 -05:00
Peter Hutterer
d570ff7c81 fix: WarpCursor needs to send MotionNotify. 2007-02-15 10:28:55 +10:30
Fredrik Höglund
3b5b7ef5c2 Move the code for resetting the DPMS mode in response to input events,
from WaitForSomething to mieqProcessInputEvents.

mieqProcessInputEvents already handles resetting the screen saver.
2007-01-03 21:05:35 +01:00
Eamon Walsh
a7f4bbea87 Add SELinux extension to the module/extension loader. 2006-12-12 13:27:02 -05:00
Daniel Stone
c3ea1f7db4 dix/mi: still more warning fixes
Fix up prototypes for PrintChildren and PrintWindowTree in the dix.
Make miPrintRegion be unconditionally defined, and move the prototype into
regionstr.h.
Change a bunch of ScreenPtr pScreen = foo; to
ScreenPtr pScreen; pScreen = foo; in window.c, so we avoid unused variable
references (as inline REGION_* doesn't reference pScreen).
2006-11-08 15:29:16 +02:00
Daniel Stone
c51fadc07d mieq: annotate with some more comments 2006-11-08 15:29:15 +02:00
Eamon Walsh
5e946dd853 Bug #8937: Extension setup functions not called on server resets 2006-11-07 13:50:19 -05:00
Daniel Stone
a5be654017 mieqEnqueue: only compare DEVICE_BITS of deviceid
Only compare DEVICE_BITS of the two deviceids, so we don't decide that
a valuator event isn't for us, because (id | MORE_EVENTS) != id.
2006-10-27 01:25:21 +03:00
Daniel Stone
3da918a16c mipointer: remember to update pointer location
Update pointer location so it doesn't get quickly reset by the next
pointer update.
2006-10-25 02:22:07 +03:00
Daniel Stone
b1debebf8f mi: remove mi motion history
This is now unneeded as we do motion history in the DIX.
2006-10-25 01:10:20 +03:00
Daniel Stone
11fb58be77 miscellaneous warning fixes
Use the correct type for time, and fix the mi prototype of EnqueueEvent.
2006-10-25 01:07:36 +03:00
Daniel Stone
4dd91c45ab miinitext: Xi and XKB are not hardware-only extensions
Xi is now a required extension, and XKB can be used without hardware,
so include them both when NO_HW_ONLY_EXTS is defined.
2006-10-23 02:50:03 +03:00
Daniel Stone
77e724585f minor formatting fixes 2006-10-22 11:45:12 +03:00
Daniel Stone
aeba855b07 move keymap copy to event processing, from enqueuing
Move the keymap copying to event processing time (in
ProcessInputEvents), instead of being at event enqueuing time.
Break SetCore{Pointer,Keyboard} out into separate functions.
Change mieqEnqueue to take a device pointer, that asks for the
_original_ device associated with this event.
2006-10-20 00:43:11 +03:00
Daniel Stone
335b503c5e Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-13 18:10:45 +03:00
Daniel Stone
41bb9fce47 mipointer: take device arguments, split miPointerAbsoluteCursor
Update mipointer API to take a device argument to (almost) all functions,
and split miPointerAbsoluteCursor into a couple of separate functions.
Remove miPointerAbsoluteCursor call from mieq, as we now deal with it in
GetPointerEvents.
Make miPointerSetPosition (successor of miPointerAbsoluteCursor) take
pointers to x and y, so it can return the clipped values.
Modify callers of miPointer*() functions to generally use the new
functions.
This should fix things with multi-head setups.
2006-10-08 20:34:32 +03:00
Daniel Stone
ef68273f5b mi/mipointer: deprecate functions which don't take a device
Deprecate all mi pointer functions which don't take a device argument, and
replace them with versions which do, in preparation for MPX.
2006-10-08 17:44:37 +03:00
Daniel Stone
80cdd26581 mi/pointer: mark public pointer functions as deprecated
Deprecate miPointer functions which don't take a device pointer.  Pointer
movement should be handled through GetPointerEvents, and functions which
take a device as an argument (e.g. miPointerPosition) will be added.
2006-10-08 17:23:54 +03:00
Daniel Stone
2cf1098436 dix/events, mi/eq: remove utterly ridiculous debugging
Remove debugging which can cause long-lived Xorg logs to grow well above 1GB
if built with --enable-debug.
2006-09-30 17:05:46 +03:00
Eamon Walsh
49a70c8570 Merge branch 'master' into my-XACE-modular 2006-09-15 15:26:57 -04:00
Daniel Stone
5e9d33fe87 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-07 15:43:31 +03:00
Michel Dänzer
8356be492c Make sure _XSERVER64 is defined when it should be and gets tested. 2006-09-06 15:20:55 +02:00
Alan Coopersmith
c2535f6792 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-10 10:37:59 -07:00
Daniel Stone
5c7001fef8 memcpy() events in
memcpy events into our event structure instead of doing pointer assignment.
2006-08-07 16:51:09 +03:00
Daniel Stone
a406f6bfea mieq: don't leak events
free all events posted through mieqEnqueue.
2006-08-04 12:40:19 +03:00
Daniel Stone
7465010d59 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
Adam Jackson
0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Daniel Stone
f18c3122a5 sanitise debug output
Don't spit out huge chunks of pointless ephemera, especially without
--enable-debug.
2006-07-21 15:19:54 -04:00
Daniel Stone
1987af8c49 add virtual core devices to DIX
Add virtual core devices, with proper keymaps etc, to the DIX.
2006-07-21 15:19:53 -04:00
Daniel Stone
84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Drew Parsons
bb3aa94845 Bug #7346: Disable Composite extension in Xprt
Xorg Bug #7346 <https://bugs.freedesktop.org/show_bug.cgi?id=7346>
Patch #6184 <https://bugs.freedesktop.org/attachment.cgi?id=6184>
2006-07-11 18:26:55 -07:00
Alan Coopersmith
a46c06dab8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
	Xext/security.c
	dix/devices.c
	dix/dispatch.c
	dix/dixutils.c
	dix/events.c
	dix/extension.c
	dix/property.c
	dix/window.c
	os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:22:51 -07:00
Eamon Walsh
8d9ccc90a5 Add XACE extension
(partially cherry picked from 8d4f21ab53 commit)
2006-06-19 16:35:03 -07:00
Greg Kroah-Hartman
96c19a3ec1 put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Greg Kroah-Hartman
40fb7eecaf fix noDamageExtension warning in Xprint/Init.c
Also took out duplicate definition of this variable in mi/miinitext.c
2006-06-08 10:11:17 -07:00
Daniel Stone
a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Daniel Stone
32be08ba72 Remove horrendously ugly DDX backward-compatibility. 2006-06-01 19:22:38 +00:00
Daniel Stone
a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Matthieu Herrb
5c7aef148d Don't destroy a pixmap twice on server exit (bugzilla #4247). 2006-05-25 09:57:47 +00:00
Adam Jackson
24310f827b Revert accidental commit 2006-05-09 18:12:50 +00:00
Adam Jackson
86ffb46358 Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer) 2006-05-09 18:04:29 +00:00
Adam Jackson
291e89d4f2 Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes. 2006-04-30 19:16:14 +00:00
Adam Jackson
d61219aaad Coverity #806: Another memory leak on OOM path. 2006-04-14 23:38:11 +00:00
Egbert Eich
b074ce2247 fixed typo. 2006-03-31 15:11:51 +00:00
Egbert Eich
9da1d2257d Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x.
Provided by Hong Bo Peng of IBM (slightly modified). Patches try to
    resolve some of the careless mixtures of ulong and uint (which are
    different size on
64bit). Bugzilla #6438.
2006-03-30 18:48:11 +00:00
Adam Jackson
7deaaa797c Big old pile of warning fixes. 2006-03-28 01:21:00 +00:00
Adam Jackson
7342dbe4b2 Remove long-dead screen region code. 2006-03-28 00:18:31 +00:00
Søren Sandmann Pedersen
a08e5e0c68 Wed Mar 22 13:42:44 2006 Søren Sandmann <sandmann@redhat.com>
Patch by Keith Packard to make sure redirected windows don't get considered
    "FullyObscured".
2006-03-22 18:44:26 +00:00
Kristian Høgsberg
c3342c8000 Merge accel_indirect branch to HEAD. 2006-03-12 00:11:34 +00:00
Adam Jackson
3fe482c77e Mark everything in misym.c as _X_EXPORT. 2006-02-15 19:05:55 +00:00
Dave Airlie
506eca5f57 Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
breaks.
2006-01-18 06:56:52 +00:00
Adam Jackson
53dbd00a75 Remove remaining #ifdef DPSEXT stanzas. 2006-01-08 23:43:54 +00:00
Adam Jackson
13c9e0c094 Bug #5525: Build a working Xprt. (Drew Parsons) 2006-01-06 23:06:15 +00:00
Adam Jackson
39ce5f1544 Remove unused X11R4 DDX compatibility function miClipNotify. 2006-01-06 17:05:26 +00:00
Adam Jackson
6d7ee4167d Style fix, make SCREEN_EPILOGUE two arguments instead of three. 2005-12-29 20:54:08 +00:00
Eric Anholt
d6646307f0 Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in
miinitext in the XGL case. Prevents mismatched structure sizes on my
    _XSERVER64 machine. At this point, with the uncommitted render/ diffs,
    Xglx starts up but displays badly.
2005-12-29 00:19:33 +00:00
Adam Jackson
05c139d4cd Enough build fixes to get {sdl,ephyr,fake} to link. 2005-12-28 10:02:54 +00:00
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin
da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Daniel Stone
825a95a1fa Remove use of dix-config and xorg-config.h from public headers. 2005-08-24 11:18:35 +00:00
Daniel Stone
79be1f6d4d Fix inclusion order of dix-config.h, so _XSERVER64 gets defined before X.h
or Xdefs.h get included. (Jürg Billeter)
2005-08-21 19:29:55 +00:00
Søren Sandmann Pedersen
5ced854186 Add miwideline.h mistruct.h mifpoly.h to sdk_HEADERS 2005-07-27 17:35:25 +00:00
Søren Sandmann Pedersen
8f6664fcff Add these files to the sdk:
cbf32.h cfb16.h cfbmap.h cfbunmap.h cfbunmap.h cfbmskbits.h xf86sbusBus.h
    mifillarch.h mispans.h
2005-07-26 23:40:45 +00:00
Kevin E Martin
5f81eb1d89 Fix the *-config.h includes so that it is possible to build modules without
having to use -include in the Makefile.
2005-07-16 03:49:59 +00:00
Kevin E Martin
6b546d0ec0 Add #include <xnest-config.h> to the Xnest source files for modularization. 2005-07-14 03:36:44 +00:00
Kevin E Martin
e348ac4b4d Prepare Xdmx and Xvfb for modularization by adding appropriate #include
<{dix,dmx}-config.h> to the source files.
2005-07-12 00:52:48 +00:00
Alexander Gottwald
845a0ac68b Revert last changes. They have to be addressed in a different way 2005-07-04 23:11:20 +00:00
Alexander Gottwald
048045a9e7 Add XWin DDX, make Xorg DDX conditional Make XF86VidMode and XF86Misc
conditional
Add XWin DDX
Added DDXTIME, DDXOSFATALERROR, DDXOSVERRORF and DDXBEFORERESET
Added fbcmap.c
Added miinitext.c
Added -I$(top_srcdir)/Xext/extmod to INCLUDES
2005-07-04 22:18:40 +00:00
Daniel Stone
0bb669638f Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". 2005-07-03 08:53:54 +00:00
Daniel Stone
e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone
826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone
9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Daniel Stone
ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00
Alan Coopersmith
a8a61bbe22 Initial experimental support for AMD64 builds on Solaris 10 x86. Improved
support for 64-bit SPARC builds on Solaris as well.
2005-05-21 07:46:38 +00:00