Jeremy Huddleston
b3ea0a2473
mi: Don't hold the event mutex during SaveScreens()
...
(cherry picked from commit 17eebd7c10
)
2008-11-19 10:58:20 -08:00
Jeremy Huddleston
531f8599e2
mi: Removed a line that I forgot to purge in the last commit... oops...
2008-11-12 21:51:50 -08:00
Jeremy Huddleston
90999af882
mi: Re-added locking to mieqProcessInputEvents
...
because mieqEnqueue can thrash it still...
(cherry picked from commit 69cc358026
)
2008-11-06 14:49:32 -08:00
Jeremy Huddleston
996e509436
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-10-28 22:18:18 -07:00
Adam Jackson
483fb847b4
mieq: Backtrace when the queue overflows.
...
Since we're probably stuck down in a driver somewhere, let's at least
try to point out where. This will need to be rethought when the input
thread work lands though.
(cherry picked from commit b736f477f5
)
2008-10-27 09:46:32 -04:00
Jeremy Huddleston
935ab4262a
mi: Actually, we don't need to lock at all in mieqProcessInputEvents...
...
(cherry picked from commit 3b55803615
)
2008-10-23 16:30:37 -07:00
Jeremy Huddleston
ee6a73b359
mi: Just some formatting consistency...
...
(cherry picked from commit 06655dac00
)
2008-10-23 16:30:18 -07:00
Jeremy Huddleston
ea8cc7c7c5
mi: Avoid possible deadlock in miEq
...
When the handler for an event requires sending a message to another thread that is waiting for the miEq mutex.
(cherry picked from commit d7d4cd3003
)
2008-10-23 14:16:30 -07:00
Jeremy Huddleston
519460e998
XQuartz: Make WarpPointer multithread safe in XQuartz.
...
(cherry picked from commit c1caeb52a4
)
2008-09-12 15:19:29 -07:00
Jeremy Huddleston
85d340f9e8
XQuartz: Added locking into mieq to protect X from eating itself
...
(cherry picked from commit 4904e04ce6
)
2008-09-12 15:18:51 -07:00
Jeremy Huddleston
4d03fc22ab
mieqProcessInputEvents: Check custom event handlers first.
...
(cherry picked from commit c9ac2f5753
)
2008-09-03 09:22:01 -07:00
Fredrik Höglund
d0ef934305
Fix the tile offset in miPaintWindow for ParentRelative windows.
...
(cherry picked from commit 244a635fcd
)
2008-08-29 14:39:05 -04:00
Kristian Høgsberg
bd81faff8c
Drop glcore GLX provider.
...
Obsoleted by the DRI swrast driver.
(cherry picked from commit 77ff8fd507
)
2008-06-26 16:14:51 -04:00
George Sapountzis
988b1b8df3
Add loader for the swrast dri driver.
...
(cherry picked from commit 6ff6465931
)
2008-06-26 16:14:51 -04:00
Keith Packard
3e71527048
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.
(cherry picked from commit 6c1accce87
)
2008-05-06 13:03:58 -04:00
Matt Turner
db00d4a4dc
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__.
(cherry picked from commit 1fa4de80fc
)
2008-04-15 11:47:48 +10:00
Eamon Walsh
c26bccf417
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.
(cherry picked from commit b5f98fcea2
)
2008-03-28 14:24:06 -04:00
George Sapountzis
3d64290547
clean some "unused" warnings
2008-03-01 19:49:24 +02:00
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
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
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
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
Adam Jackson
fa47910045
Clean up many #if 0.
2007-12-02 12:40:25 -05:00
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
Eamon Walsh
60be452c2e
xace: restore the old SaveScreens function and introduce new API, since the
...
old version is called from drivers...
2007-11-19 16:59:34 -05:00
Eamon Walsh
a95bb52b43
devPrivates rework: add missing include of dix/privates.h
2007-11-19 16:34:38 -05:00
Adam Jackson
748cfbc820
Disinfect mi/ of mfb.
2007-11-17 21:23:05 -05:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
Ben Byer
ce7cfbe261
Fixed check to refer to DarwinApp, not all Darwin targets
2007-11-08 20:10:51 -08:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Daniel Stone
be9ee17f96
mi: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:41 +00:00
Aaron Plattner
f2e310132f
Add CreatePixmap allocation hints.
...
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
Kristian Høgsberg
a5546a99ac
Change the GLX module to initialize after COMPOSITE.
...
This changes the module initalization order so that the GLX module initializes
after COMPOSITE. The reason for this change is to be able to initialize a
GLX visual config for the COMPOSITE ARGB visual.
2007-10-29 18:14:18 -04:00
Eamon Walsh
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
Kristian Høgsberg
7d74690536
Simplify and clean up GLX visual initialization.
...
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-18 21:03:43 -04:00
Eamon Walsh
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Eamon Walsh
baabae623b
xselinux: Started reworking extension using new XACE hooks.
2007-10-17 13:54:56 -04:00
Ben Byer
3d4eb17b38
mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI
2007-10-14 18:07:03 -07:00
Dodji Seketeli
81692b628f
Fix #12650 : "windows not receiving mouse events in multiple screens context"
...
* dix/events.c, include/dix.h:
(UpdateSpriteForScreen): added this to update the mouse sprite context
when we switch from a pScreen to another.
* mi/mipointer.c:
(miPointerWarpCursor): as we are switching to a new pScreen,
don't forget to update the mouse sprite context.
2007-10-02 13:48:48 +02:00
Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
Eric Anholt
b9f7aeb200
Merge remote branch 'origin/master' into paint-window
...
Conflicts:
mi/miexpose.c
2007-09-13 00:15:45 +00:00