Commit Graph

2869 Commits

Author SHA1 Message Date
Jeremy Huddleston
315f089056 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c)
2008-05-08 19:58:24 -07:00
Jeremy Huddleston
a07c5ad172 XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston
05f23ed3ea XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad547)
2008-05-08 19:58:09 -07:00
Adam Jackson
f17ba5d584 Bug #13104: Remove broken XAA a1 glyph fast path. 2008-05-08 16:04:24 -04:00
Adam Jackson
ddaecfa13c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2008-05-08 14:33:58 -04:00
Daniel Stone
641a5f955b Build: Ensure xf86DefModeSet.c ends in an empty line
This shuts up a warning.
2008-05-07 22:29:04 +03:00
Adam Jackson
9c2e0871cf Bug #13104: XAA: Adapt to glyph storage changes.
Glyph bits are now stored in a proper pixmap, not just hanging off the
end of a GlyphRec.
2008-05-07 13:21:26 -04:00
Adam Jackson
718652eaf9 Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory.
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code.  Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.

Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
2008-05-06 17:52:37 -04:00
Jeremy Huddleston
a85d3ac87c XQuartz: Fixed typo
(cherry picked from commit 56b7988d26)
2008-05-06 03:04:13 -07:00
Jeremy Huddleston
077ced6384 XQuartz: Added uncommitted files
(cherry picked from commit e414ec462c)
2008-05-06 03:04:09 -07:00
Jeremy Huddleston
80e502c5d1 Fixed up dist
(cherry picked from commit f225222ba2)
2008-05-06 03:04:04 -07:00
Jeremy Huddleston
7295e54433 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
(cherry picked from commit 453a982e63)
2008-05-06 02:49:48 -07:00
Ben Byer
d41d677ab4 Xquartz: experimental embedding of Sparkle.framework
(cherry picked from commit b7a1a640ce)
2008-05-06 02:49:41 -07:00
Dave Airlie
e4ebfed178 xf86edid: fix typo in debug output 2008-05-06 16:47:18 +10:00
Aaron Plattner
d500eeb945 Xephyr: Handle depth 30 and reject higher depths rather than crashing. 2008-05-04 10:26:25 -07:00
Jeremy Huddleston
f4a68f3701 XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
(cherry picked from commit 8d9eab3a2e)
2008-05-02 17:42:41 -07:00
Jeremy Huddleston
96fa7da3b8 XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
(cherry picked from commit ff10c37bdd)
2008-05-02 17:42:36 -07:00
Jeremy Huddleston
a338007be6 XQuartz: Adjust the screen origin offset properly for multimonitor setups
(cherry picked from commit f2020b9836)
2008-05-01 18:04:18 -07:00
Paulo Cesar Pereira de Andrade
01c61f3d97 xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.
This patch only creates a Files section if required, so if no entries are
added, an empty Files section will not be created.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-01 15:55:15 +09:30
Paulo Cesar Pereira de Andrade
6899ff81e8 Fix an off by one read error in drmSIGIOHandler().
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-01 10:14:30 +09:30
Jeremy Huddleston
ec0419b505 XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
(cherry picked from commit 1fcf74a436)
2008-04-30 17:33:11 -07:00
Kazuhiro Inaoka
ce36ae526d Add M32R architecture support (bug #10020)
Still needs autotools support, so this won't actually _build_: it's just
a starting point.
2008-04-30 11:58:32 +03:00
Ben Byer
b71b51c982 xquartz: created darwinTablet, to represent tablet events
(cherry picked from commit 50641bce73)
2008-04-29 23:59:34 -07:00
Ben Byer
519581b0ba xquartz: remove unused params from DarwinEQInit
(cherry picked from commit 299a056737)
2008-04-29 23:59:31 -07:00
Jeremy Huddleston
d70487a4c0 XQuartz: Fix to tablet-event handling code; we now scale
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecc)
2008-04-29 23:59:26 -07:00
Hong Liu
f65a1a62f9 Keep rotation wrappers in place while transforms are in use
LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
this, the presense/absence of that data is insufficient to know whether
the screen function wrappers are necessary. Instead, the 'transform_in_use'
flag should be used.

This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
time to free the rotation data; it will be reallocated on EnterVT.
2008-04-29 09:00:11 -07:00
Jeremy Huddleston
d5ab89f4f1 XQuartz: Unset CFProcessPath... blech
(cherry picked from commit ce4fbfbc75)
2008-04-28 15:55:01 -07:00
Jeremy Huddleston
0c2312b21b XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
(cherry picked from commit 22cf724376)
2008-04-28 15:42:12 -07:00
Jeremy Huddleston
c3dc4bdbb0 XQuartz: Disabled DPMS extension
(cherry picked from commit 1448fed9b6)
2008-04-28 15:42:02 -07:00
Jeremy Huddleston
07382a70c7 XQuartz: Added thread debugging to xprFrame.c
(cherry picked from commit 41542502b3)
2008-04-28 15:40:22 -07:00
Jeremy Huddleston
e973430608 XQuartz: More startup / threading house cleaning.
(cherry picked from commit 72653c24c0)
2008-04-28 11:49:19 -07:00
Jeremy Huddleston
4b46fc931e XQuartz: Updated Localizable.strings
(cherry picked from commit d8d9c866b9)
2008-04-28 11:49:18 -07:00
Jeremy Huddleston
4017ebe5bf XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
(cherry picked from commit 03e707987f)
2008-04-28 11:49:16 -07:00
Jeremy Huddleston
0bd28315af Xquartz: Added missing to EXTRA_DIST
(cherry picked from commit f4b963256f)
2008-04-26 23:19:33 -07:00
Jeremy Huddleston
ef1c520537 XQuartz: Cleaned up startup and thread creation a tad.
(cherry picked from commit c861fe00e1)
2008-04-26 19:21:05 -07:00
Jeremy Huddleston
b114d4e861 XQuartz: Don't subtract the titlebar off of the pointer_y
(cherry picked from commit 00a9567acc)
2008-04-26 17:05:34 -07:00
Jeremy Huddleston
b9ca789635 XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a3)
2008-04-25 18:04:22 -07:00
Jeremy Huddleston
0209e46249 XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
(cherry picked from commit 515b8b855a)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19)
(cherry picked from commit 9112f29043)
2008-04-24 23:50:21 -07:00
Peter Hutterer
9ab4e2fd8e xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.

This is an addon to 6d22a9615a, an attempt to
fix Bug 14418.

X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
2008-04-24 14:19:28 +09:30
Jeremy Huddleston
d09c520b32 Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f3289)
2008-04-23 10:22:34 -07:00
Jeremy Huddleston
b05b416c62 XQuartz: No need to include indirect.c a second time
(cherry picked from commit 41ed532525)
2008-04-23 10:17:13 -07:00
Ben Byer
4e3a8af575 xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2)
2008-04-23 10:16:55 -07:00
George Sapountzis
00effad583 xephyr: XEPHYR_DRI is identical to XF86DRI 2008-04-23 18:11:56 +03:00
George Sapountzis
6a9f7f28ec xephyr: sync with mesa 2008-04-23 18:11:56 +03:00
George Sapountzis
7ffc68c5cc xephyr: libGL is client lib 2008-04-23 18:11:56 +03:00
George Sapountzis
a27c244d72 xephyr: Makefile cleanup 2 2008-04-23 18:11:56 +03:00
George Sapountzis
d4d19b2f22 xephyr: Makefile cleanup 1 2008-04-23 18:11:56 +03:00
George Sapountzis
a88c6b6646 glcore: drop GLcore (files) 2008-04-23 18:11:55 +03:00
George Sapountzis
dd7a53f8f2 glcore: drop GLcore (build system) 2008-04-23 18:11:55 +03:00
George Sapountzis
567d389d47 glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
2008-04-23 18:11:55 +03:00
George Sapountzis
efb723e166 glcore: prepare for dynamic loading
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
        DLOPEN_LIBS - to dlopen the glcore dso
        LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use

the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
2008-04-23 18:11:55 +03:00
Julien Cristau
fbad87f2ae autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
2008-04-23 14:59:24 +02:00
Jeremy Huddleston
76381092e8 XQuartz: Make sure QuartzAudioInit() gets run.
(cherry picked from commit bb3d034675)
(cherry picked from commit 824b31c7f8)
2008-04-23 02:22:28 -07:00
Ross Burton
e77f65768e Reuse the existing framebuffer mode in kdrive/fbdev
When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
that unless told otherwise.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:07:46 +01:00
Ross Burton
c4fd112153 Add mediumraw support to the linux kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:05:53 +01:00
Ross Burton
455383db95 Enable the epson kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:04:31 +01:00
Ross Burton
20a90bef8b Add a default touchscreen path
When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
specified.
2008-04-22 16:37:02 +01:00
Peter Hutterer
2ddbfd3457 xnest: re-enable XKB support. #10015
XKB was disabled in 08928afb05, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.

X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>
2008-04-22 16:32:56 +09:30
Jeremy Huddleston
a8b8700c73 XQuartz: Fixed cmd-tab to bring all windows forward.
(cherry picked from commit e48e2ce931)
2008-04-21 23:45:00 -07:00
Jeremy Huddleston
590688131d XQuartz: Fixed quit dialog to be more conforming with HIG.
(cherry picked from commit 14c6b837bb)
2008-04-21 19:08:30 -07:00
Ben Byer
570b0dca26 Fix for pointer-offset issue when using a multi-display environment on X11.app.
(cherry picked from commit 9a7e14286c)
2008-04-21 17:55:19 -07:00
Jordan Crouse
4fa89fbe18 xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode' 2008-04-21 12:09:00 -06:00
Julien Cristau
40c6be1408 Minor xorg.conf manpage fixups
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
2008-04-20 20:36:44 +02:00
Jeremy Huddleston
4bcfed2f9c Revert "Removed XWin DDX"
This reverts commit 6550078b09.

Doctor, I'm starting to get a pulse...
2008-04-20 08:35:42 -07:00
Jeremy Huddleston
14396fdeba XQuartz: Cleanup turning off COMPOSITE
(cherry picked from commit 8f920fca6f)
2008-04-20 01:24:54 -07:00
Jeremy Huddleston
d13828797f XQuartz: Cleaned up some casting to get rid of compiler warnings
(cherry picked from commit 6f1c85b965)
2008-04-20 01:24:51 -07:00
Jeremy Huddleston
6550078b09 Removed XWin DDX 2008-04-19 09:29:46 -07:00
Jeremy Huddleston
ed9dabb47c Last of the spam... I promise...
(cherry picked from commit 45ebee4f72)
2008-04-18 20:31:06 -07:00
Jeremy Huddleston
49f2bb4681 XQuartz: More sanitization of the namespace
(cherry picked from commit bc50d41f9d)
2008-04-18 20:25:38 -07:00
Jeremy Huddleston
c2f0d020b5 XQuartz: Removed unneccessary include
(cherry picked from commit 45ff59e69e)
2008-04-18 20:12:05 -07:00
Jeremy Huddleston
5183fea6d3 XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d6721)
2008-04-18 20:07:55 -07:00
Ben Byer
edd3fb784b random flailing
(cherry picked from commit 7fb9b2dc61)
2008-04-18 20:07:41 -07:00
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
Jeremy Huddleston
c14f5dc237 XQuartz: Forgot to commit xprEvent.[hc] ...
(cherry picked from commit 70e543baf2)
2008-04-17 20:31:24 -07:00
Ben Byer
22bb7608a0 Added XKB support for Xquartz
(cherry picked from commit 56dc121520)
2008-04-17 17:25:55 -07:00
Jeremy Huddleston
652479dba3 XQuartz: Moved some rootless-specific cruft into xpr
(cherry picked from commit 31625cc03b)
2008-04-17 15:50:11 -07:00
Jeremy Huddleston
2a1ba20af9 XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
(cherry picked from commit 7b087c965b)
2008-04-17 15:24:35 -07:00
Jeremy Huddleston
55f80d7545 XQuartz: A little more debugging output from threadSafety
(cherry picked from commit f6fbdbf838)
2008-04-17 15:24:33 -07:00
Jeremy Huddleston
0d61f6fca1 XQuartz: Fixed some missing prototypes
(cherry picked from commit 95056afc56)
2008-04-17 13:21:13 -07:00
Jeremy Huddleston
dbd4c03156 XQuartz: Added framework for asserting which thread we're in.
(cherry picked from commit 00beb98251)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549 XQuartz: Include version info for CrashReporter
(cherry picked from commit b4992755c3)
2008-04-17 11:57:45 -07:00
Jeremy Huddleston
6d11712c2a XQuartz: Use strerror(errno)... cause I like text more than grepping header files
(cherry picked from commit 1b4c37d8f9)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc merged darwinKeyboard.[ch] into quartzKeyboard
(cherry picked from commit 57bb073209)
2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02 oops, missed a spot
(cherry picked from commit 19872a6aeb)
2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc formatting cleanup
(cherry picked from commit 769acd2934)
2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226 delete debugging spew
(cherry picked from commit f04f3af86a)
2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25 add support for horizontal scrolling (buttons 6 and 7)
(cherry picked from commit f525a4a432)
2008-04-17 10:41:50 -07:00
Ben Byer
612e901ef6 enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
(cherry picked from commit ab662c736e)
2008-04-17 10:41:46 -07:00
Ben Byer
5bdfbfbedc darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
(cherry picked from commit a8a090b853)
2008-04-17 10:41:42 -07:00
Ben Byer
58e42683c9 hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
(cherry picked from commit cab54466a6)
2008-04-17 10:41:38 -07:00
Ben Byer
cd3470a0cf kludge: miEqEnqueue wants a device, even if we're passing custom messages,
so give it one
(cherry picked from commit a494ff04b2)
2008-04-17 10:41:30 -07:00
Drew Parsons
966ae1781f Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
2008-04-18 01:20:36 +10:00
Drew Parsons
571206832d Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
2008-04-18 01:14:01 +10:00
Jeremy Huddleston
8716d081fd XQuartz: Don't enable rootless accelerated functionality... crashy...
(cherry picked from commit cdb4c291d8)
2008-04-16 23:14:06 -07:00
Jeremy Huddleston
2ffdb0eb64 XQuartz: Don't use composite.
(cherry picked from commit 6d3d344b5b)
2008-04-16 21:54:00 -07:00
Jeremy Huddleston
757a1bf3a3 Xquartz: Don't need to link against rlAccel since we don't use it
(cherry picked from commit 180ec128ad)
2008-04-16 21:53:03 -07:00