andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,707 Commits 86 Branches 473 Tags 48 MiB
99d28c3ef3
Commit Graph

282 Commits

Author SHA1 Message Date
Peter Hutterer
99d28c3ef3 Merge branch 'master' into mpx 
Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c
 2008-05-20 10:20:14 +09:30
Peter Hutterer
6fb76acc45 mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite(). 
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
 2008-05-16 21:10:00 +09:30
Peter Hutterer
a6659291c7 mi: protect against NULL-pointer dereference. 
Required by the recent patch to use a NullCursor instead of UndisplayCursor().
 2008-05-14 09:42:50 +09:30
Peter Hutterer
1fc1a2897e Remove UndisplayCursor API. 
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
 2008-05-13 11:17:02 +09:30
Peter Hutterer
913989d643 mi: don't try to display a cursor for devices w/o cursors. 2008-05-13 11:17:02 +09:30
Adam Jackson
1c8bd318fb X n'est pas une print API. 2008-05-12 14:15:11 -04:00
Keith Packard
6c1accce87 Empty the borderClip of manual redirect windows. (bug 15823) 
Thanks to Owen Taylor for root-causing this one.

If a TreatAsTransparent window has any area in the borderClip, that will be
added to the totalClip region for use by other windows. That's wrong.
Instead, simply empty the borderClip for TreatAsTransparent windows right up
front.
 2008-05-04 21:54:22 -07:00
Peter Hutterer
a0e6a7d4f5 dix: resize EQ to minimum size to avoid reallocs during SIGIO. 
When a new device is added, calculate the event size needed if a DCCE event is
sent and set the EQ's event size to this minimum. This avoids reallocs when a
event is sent (which may happen during a SIGIO).
 2008-04-30 17:57:48 +09:30
Peter Hutterer
ff36753755 mi: call the custom event handlers for both MD and SD. 2008-04-29 14:53:41 +09:30
Peter Hutterer
1fab51edfc mi: guard against NULL-pointer dereference. 2008-04-28 11:37:21 +09:30
Peter Hutterer
e251c9e75a Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
Peter Hutterer
f5ac98747d Standardise copyright headers for all new files created as part of MPX. 2008-04-25 14:50:24 +09:30
Peter Hutterer
8190ef8754 Merge branch 'master' into mpx 
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
 2008-04-22 18:04:05 +09:30
Peter Hutterer
179a082c26 Xext: route event through master if required (XTestFakeInput) 2008-04-22 17:45:55 +09:30
Peter Hutterer
fb784d99c5 mi: fix typo in comment. 2008-04-22 17:45:48 +09:30
Adam Jackson
a7503615a6 Death to TOG-CUP. 
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
 2008-04-18 19:56:41 -04:00
Eric Anholt
25827fde68 Nuke the MIT-SUNDRY-NONSTANDARD extension. 
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
 2008-04-18 16:37:08 -07:00
Adam Jackson
eafaf40fb3 Death to APPGROUP. 2008-04-18 18:50:05 -04:00
Adam Jackson
f6617b4127 Death to Extended Visual Information. 2008-04-18 18:28:01 -04:00
Matt Turner
1fa4de80fc Check for __x86_64__ when we check for __amd64__ 
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
 2008-04-12 20:39:18 +02:00
Magnus Vigerlöf
5ffbcfec3d dix: Ensure Proximity events don't kill the server. 
Add Prox events to the if-clauses with the other events
that are usually sent from the input devices.
Ensure that the event deliverers won't try to deliver
events of type '0' (some extended events doesn't have
an equivalent core-type)

Small modification by Peter Hutterer.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-04-08 14:43:22 +09:30
Peter Hutterer
fd06e8f8c1 Merge branch 'master' into dcdc_rework 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
 2008-04-07 07:56:41 +09:30
Eamon Walsh
b5f98fcea2 XSELinux: Add xorg.conf option for permissive/enforcing/disabled. 
Patch by Joe Nall.

The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
 2008-03-28 14:14:23 -04:00
Daniel Stone
88bec0915e mi: More meaningful assert crashes 
When we fail an assert in miregion.c (which happens every now and then,
though I haven't yet checked up why), at least generate a segfault, so
we'll get a backtrace.
 2008-03-14 21:56:31 +02:00
Peter Hutterer
4f2cd0ed96 Merge branch 'master' into mpx 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
 2008-03-04 18:11:10 +10:30
George Sapountzis
3d64290547 clean some "unused" warnings 2008-03-01 19:49:24 +02:00
Peter Hutterer
b81c330f70 mi: remove RawDeviceEvent's ID changing. 2008-02-14 09:32:54 +10:30
Eamon Walsh
4be69e41c0 Revert "Bug #8937: Extension setup functions not called on server resets" 
This reverts commit 5e946dd853.

The devPrivates rework makes this workaround unnecessary.
 2008-02-11 16:15:26 -05:00
Peter Hutterer
521a7f26e0 mi: Only UpdateSpriteForScreen if we actually changed the screen. (Bug #12650) 
X.Org Bug 12650 <http://bugs.freedesktop.org/show_bug.cgi?id=12650>
 2008-02-05 18:34:31 +10:30
Peter Hutterer
0ac1755977 Merge branch 'master' into mpx 
Conflicts:

	Xext/sampleEVI.c
 2008-01-26 13:55:07 +10:30
Eamon Walsh
e915a26397 xselinux: Move the extension to extmod instead of being built-in. 2008-01-25 19:22:19 -05:00
Eamon Walsh
f6a78ee143 XACE: Remove the extension code entirely, XACE is completely static now. 2008-01-25 18:04:10 -05:00
Peter Hutterer
883811c2be dix: remove inputInfo.pointer reference in TryClientEvents. 
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
 2008-01-18 18:48:46 +10:30
Peter Hutterer
38bf01bd1c Merge branch 'master' into mpx 2008-01-10 13:38:46 +10:30
Peter Hutterer
e070c2cbef mi: change infamous "Tossed event ..." error for something more explanatory. 
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
(cherry picked from commit 117458d2db)
 2008-01-09 13:42:10 +10:00
Peter Hutterer
8da83836b6 Merge branch 'master' into mpx 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
 2008-01-03 17:04:54 +10:30
Eamon Walsh
643c52be32 xselinux: Remove "X" prefix on remaining functions and strings. 
Should be evident from the context.
 2007-12-28 13:27:28 -05:00
Jeremy Huddleston
f3042a63be XQuartz: Handle Pseudorami init in miinitext 
(cherry picked from commit a585c94fed)
 2007-12-21 01:24:43 -08:00
Dave Airlie
6a5c3e04fa mi: set the private key to a unique non-zero value 2007-12-17 14:59:12 +10:00
Bartosz Fabianowski
5b02a6ca5b Input: Fix proximity events with valuators 
Initialise num_events to 1, so we always send a proximity event, and then
optionally valuator events.  Also make sure mieq can deal with valuator
events sent after proximity events.
 2007-12-14 13:15:26 +02:00
Eamon Walsh
c8feb73f58 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
 2007-12-13 18:38:25 -05:00
Peter Hutterer
3a058456e0 mi: unify ErrorFs, prepend [mi] 2007-12-07 20:23:36 +10:30
Peter Hutterer
c5acf401da mi: unify last two ErrorF's in mieq.c 2007-12-07 20:19:43 +10:30
Peter Hutterer
117458d2db mi: change infamous "Tossed event ..." error for something more explanatory. 
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
 2007-12-07 20:18:49 +10:30
Adam Jackson
fa47910045 Clean up many #if 0. 2007-12-02 12:40:25 -05:00
Peter Hutterer
a4edfbef02 mi: only call UpdateSpriteForScreen if the screen actually changed. 
If we call it unconditionally, we flip the dev->spriteInfo->sprite permanently
when using XTestFakeInput (once in CheckMotion as called from the
processInputProc, another time in UpdateSpriteForScreen when we actually warp
the cursor). USFS also updates to the screen's root window unconditionally,
which is not really what we want if we haven't changed screen at all.
 2007-11-24 16:16:48 +10:30
Keith Packard
33b94da632 Re-add call to XFixesExtensionInit for static servers. 
This reverts a portion of bcbaf2a0ce which
removed the call to XFixesExtensionInit and some cpp lines.
 2007-11-23 16:01:11 -08:00
Jeremy Huddleston
bcbaf2a0ce Darwin: Dead code removal, Code cleanup, Added launcher 
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
 2007-11-21 19:52:11 -08:00
Alan Coopersmith
a55ec1a9f4 Restore checks for __i386 where needed for Sun compilers on Solaris 2007-11-20 18:31:07 -08:00
Eamon Walsh
2d17f47cc7 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
 2007-11-19 18:10:46 -05:00