Commit Graph

2584 Commits

Author SHA1 Message Date
Jeremy Huddleston
ec24a6b5aa XQuartz: Fixed switching into XQuartz via expose.
(cherry picked from commit 627ed60ce5)
2008-01-12 12:01:52 -08:00
Peter Harris
0883e838e2 xf86misc.c: Avoid use of swapped values 2008-01-09 18:43:55 -08:00
Alan Coopersmith
59a63d72a1 Fix reference to old versions of XFree86 to not say "Xorg 4.2 or earlier" 2008-01-09 18:42:58 -08:00
Richard Purdie
c31aead0fe [Kdrive] make XCalibrate 'orientation aware' 2008-01-08 12:31:47 +01:00
David Nusinow
30375cd6d1 Don't log DPMS enabling as being from xorg.conf if it's not 2008-01-07 20:57:30 -05:00
David Nusinow
260505e3c5 Log enabling of DPMS even when it's not set in xorg.conf 2008-01-06 16:37:13 -05:00
Julien Cristau
7e76221659 Fix the name of the XFree86-Misc extension in the xorg.conf manpage. 2008-01-06 18:23:09 +01:00
Julien Cristau
59df687835 Document the AllowEmptyInput, AutoAddDevices and AutoEnableDevices flags
Add documentation for the new AllowEmptyInput, AutoAddDevices and
AutoEnableDevices server flags in the xorg.conf manpage.
2008-01-06 17:02:03 +01:00
Jeremy Huddleston
7d226d6a25 XQuartz: Cleanup for strict-prototyping
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4be)
2008-01-05 03:17:27 -08:00
Jeremy Huddleston
11967dce11 XQuartz: Fixed copyright in About box for 2008. Happy New Year! 2008-01-04 23:10:10 -08:00
Jeremy Huddleston
aca75f389e XQuartz: Flush the debug log for easier debugging
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42)
2008-01-04 23:10:10 -08:00
Alex Deucher
20eb26f9d1 Fix potential crasher in xf86CrtcRotate()
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
2008-01-03 22:53:36 -05:00
Jeremy Huddleston
e46d559739 XQuartz: Cleaned up color map configuration.
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27)
2008-01-03 13:25:56 -08:00
Alan Coopersmith
ccf6636d2c Kill xf86getpagesize even harder (dummylib & ioport) 2008-01-02 19:28:33 -08:00
Alan Coopersmith
f6666dcc3b Add dixAllocatePrivate stub to dummylib for utils
Normally not necessary, except when building non-optimized/debug causes
the inline functions from private.h to appear in os-support/libxorgos.la
2008-01-02 19:19:55 -08:00
Alan Coopersmith
73f4229960 Fix names/types of new vuidMouse{Get,Set}ScreenPrivates macros 2008-01-02 19:17:54 -08:00
Adam Jackson
85365ddf16 EDID 1.4: If given a native pixel format, use it when inferring virtual. 2007-12-28 17:38:52 -05:00
Adam Jackson
312b30cb03 EDID 1.4: First detailed mode is always preferred.
... so act like it in the modelist generator, not just the parser.
2007-12-28 17:38:51 -05:00
Jurij Smakov
36ff05771b GL: Add GLX compile flags lost in modular X server changes
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64.  This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.

Also, Alpha needs to pass -mieee to the compiler as well.

This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever.  To the best of my
knowledge the patch was written by Jurij Smakov.  See Debian bug
number #388125.

I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392.

Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-29 00:00:04 +02:00
Adam Jackson
bae459cfc4 Don't carp on EDID 1.4 blocks anymore.
Also whine more loudly when we get something other than 1.x.
2007-12-28 16:53:17 -05:00
Adam Jackson
70b2d6cfeb Check the gamma value, not its address. 2007-12-28 16:53:17 -05:00
Adam Jackson
592d814ee0 EDID 1.4: Additional semantics for display feature bits.
First mode is _always_ preferred in 1.4; the bit that used to mean this
now means that the preferred mode is also the native pixel format.  The
old "is GTF" bit now means "is continuous-frequency" instead.

Section 3.6.4, Table 3.14: Feature Support, Notes 4 and 5.
2007-12-28 16:53:17 -05:00
Adam Jackson
322d0103ae EDID 1.4: Alternate color encodings for digital inputs.
Section 3.6.4, Table 3.14: Feature support.
2007-12-28 16:53:17 -05:00
Adam Jackson
f1f43caf7e EDID 1.4: Allow for gamma definition in extension blocks.
Section 3.6.3, Table 3.13: Display Transfer Characteristics (Gamma)
2007-12-28 16:53:16 -05:00
Adam Jackson
861ee38817 EDID 1.4: Additional aspect ratio semantics for screen size fields.
Section 3.6.2, Table 3.12: Horizontal and Vertical Screen Size or
Aspect Ratio.
2007-12-28 16:53:16 -05:00
Adam Jackson
14b5c8a447 EDID 1.4: Extended support for digital interfaces.
Section 3.6.1, Table 3.11: Video Input Definition.
2007-12-28 16:53:16 -05:00
Adam Jackson
a948216dcc EDID 1.4: Decode CVT 3-byte codes and add them to the mode pool.
Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition.
2007-12-28 16:53:16 -05:00
Adam Jackson
f6df66cc89 EDID 1.4: Trivial support for new detailed sections.
Nothing actually decoded yet, but at least we print what they are.

New in EDID 1.4:
- Color Management Data (0xF9), Section 3.10.3.7
- CVT 3 Byte Code Descriptor (0xF8), Section 3.10.3.8
- Established Timings III Descriptor (0xF7), section 3.10.3.9
- Manufacturer-specified data tag (0x00 - 0x0F), section 3.10.3.12
2007-12-28 16:53:16 -05:00
Adam Jackson
bac3ecde39 EDID 1.4: Allow for sync range offsets.
Table 3.26: Display Range Limits & Timing Descriptor Block Definition
2007-12-28 16:53:16 -05: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
Adam Jackson
938da5ee38 Add HDMI and DisplayPort connector types. 2007-12-28 12:23:44 -05:00
Daniel Stone
941058f8da KDrive: Xephyr: Don't leak screen damage structure 2007-12-28 15:51:36 +02:00
David S. Miller
ae869fc766 [SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
xf86getpagesize() was removed, but this one call site was
not fixed up.

Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-27 07:34:09 +01:00
Jeremy Huddleston
beb29c605b XQuartz: *REALLY* use CFStringCreateWithCString
I need sleep!  Why am I making these stupid mistakes... sorry for pointless commit spam.  ugg.
(cherry picked from commit b16351fc64)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston
5dd895efa3 XQuartz: Use CFStringCreateWithCString
(cherry picked from commit 79782b0e14)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston
2c24231fc2 XQuartz: Reduce code duplication in X11.app
(cherry picked from commit b81809cd91)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston
f3042a63be XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fed)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston
fa9680a730 XQuartz: Added localization.
(cherry picked from commit 7a5cc7bfbb)
2007-12-20 19:38:49 -08:00
Jeremy Huddleston
603a8b73d4 XQuartz: Cleaned up command line arguments. 2007-12-20 18:29:57 -08:00
Jeremy Huddleston
4cf3002b60 XQuartz: Kill off server-main.c and launcher-main.c
Now using xinit
(cherry picked from commit 5d6ae3d299)
2007-12-20 18:09:24 -08:00
Jeremy Huddleston
1f74bef1ad XQuartz: Don't fork to exec app_to_run.
Plus other housecleaning...
(cherry picked from commit ae302db472)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
2d15d439f8 Xquartz: Use X11ControllerMain()
(cherry picked from commit a9ac932543)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
42802a8e6b Xquartz: General Cleanup
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4)
2007-12-20 13:18:17 -08:00
Dave Airlie
7ef7727b80 entity sharing: make !shareable entity non-fatal.
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
2007-12-20 10:11:26 +10:00
Adam Jackson
7721d3e921 Reference cvt and gtf in the xorg.conf man page. 2007-12-18 19:14:26 -05:00
Jeremy Huddleston
bf20c4374a Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
(cherry picked from commit 767b4c9d9d)
2007-12-16 01:14:55 -08:00
Samuel Thibault
58c2898b62 xfree86: permit access to io port 0xffff on the hurd 2007-12-16 01:21:45 +01:00
Ben Byer
a3f7f7b60e clarified debug message to indicate that we're sleeping
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf)
2007-12-14 15:22:57 -08:00
Ben Byer
e0e59b3bbc we need to link against CoreServices, not ApplicationServices
(cherry picked from commit ba4d2096e7)
2007-12-14 15:22:49 -08:00
Ben Byer
062d9234e2 fixed bug in x11-exec that prevent icon from showing up
(cherry picked from commit e1f4a0c20d)
2007-12-14 15:22:44 -08:00
Jeremy Huddleston
95c02adea8 Xquartz: Fixed cpprules include 2007-12-14 15:21:40 -08:00
Otavio Salvador
8673033700 kdrive/ati: use operating system input devices 2007-12-14 13:15:27 +02:00
Otavio Salvador
e110255501 kdrive/vesa: use operating system input devices 2007-12-14 13:15:27 +02:00
Otavio Salvador
863ba390e9 kdrive/fbdev: use operating system input devices 2007-12-14 13:15:27 +02:00
Arkadiusz Miskiewicz
ca59d3f7bd Xprint: Clean up generated files
Remember to clean generated wrapper files.
2007-12-14 13:15:26 +02:00
Eamon Walsh
a2df51f8e9 Bump video driver ABI and extension ABI for devPrivates rework. 2007-12-14 00:53:54 -05:00
Eamon Walsh
86b2e59bfb Merge branch 'master' into XACE-SELINUX
Conflicts:

	configure.ac

This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
Eamon Walsh
1c1a4bc970 devPrivates rework: more cleanup from previous merge operation. 2007-12-13 19:51:40 -05:00
Jeremy Huddleston
cb0d7e2c26 Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73 Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fe)
2007-12-13 16:29:09 -08:00
Ben Byer
82e1aff9fb Modified X11 plist to use x11-exec
(cherry picked from commit 7d9a11329e)
2007-12-13 16:28:35 -08:00
Ben Byer
1a5910588a created x11-exec wrapper, which uses LaunchServices to find
(and then exec) X11.app
(cherry picked from commit fc04c9759b)
2007-12-13 16:28:30 -08: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
efcdc0d701 Correct the documentation comments in xf86Modes.c
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
2007-12-13 15:38:41 -05:00
Adam Jackson
1768af38c7 Add infrastructure for validating modes by memory bandwidth. 2007-12-13 15:06:18 -05:00
Adam Jackson
4359193aaa Explain a confusing #ifdef. 2007-12-13 10:59:48 -05:00
Adam Jackson
8cedbb0a53 Clean up some #if 0. 2007-12-13 10:57:35 -05:00
Aaron Plattner
a125ce4a84 Fix dist by including modeline2c.awk.
This was broken by commit cb44b6121c, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
2007-12-12 12:24:29 -08:00
Aaron Plattner
6715923437 Get rid of xf86DefModes.c.
It's out of date and not included in the build.  Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
2007-12-12 10:59:15 -08:00
Jeremy Huddleston
eab0c4e490 Xquartz: Pre-process Xquartz man page
(cherry picked from commit dec2633c41)
2007-12-10 21:03:37 -08:00
Jeremy Huddleston
1ff945a8e4 Xquartz: Make Alt work with Xmodmap again
(cherry picked from commit 0e017177dc)
2007-12-10 21:03:30 -08:00
Jeremy Huddleston
7d61893b49 Xquartz: Removed Xplugin.h from EXTRA_DIST
(cherry picked from commit a746383eca)
2007-12-10 20:34:40 -08:00
Ben Byer
8f2eff643b remove Xplugin.h, because we should use the one in /usr/include
(cherry picked from commit 3e881032f3)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston
7b573ed436 Xquartz: Added missing link to libconfig.a
(cherry picked from commit 14ec1cf1cb)
2007-12-09 12:02:15 -08:00
Jeremy Huddleston
020b0e92b0 Xquartz Added quartzKeyboard.h to EXTRA_DIST
(cherry picked from commit 37c9781fdb)
2007-12-08 11:49:55 -08:00
Ben Byer
5e016fa9b2 Added darwinEvents.h to EXTRA_DIST
(cherry picked from commit 45e5247564)
2007-12-08 11:33:54 -08:00
Jeremy Huddleston
6bb5dacc17 Xquartz: Actually add quartzForeground.[hc]
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaa)
2007-12-08 01:42:03 -08:00
Jeremy Huddleston
02df036670 Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
(cherry picked from commit c5ccb98d5d)
2007-12-08 01:28:49 -08:00
Jeremy Huddleston
740cc54f08 Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f)
2007-12-08 01:25:13 -08:00
Jeremy Huddleston
41a0aeaae9 XQuartz: Fixed "Multiple Dock Icons"
BAM!
(cherry picked from commit d0dca8a885)
(cherry picked from commit 0502955a2a)
2007-12-08 00:35:14 -08:00
Jeremy Huddleston
a1b0346853 XQuartz: Cleaned up configure, X11.app path in launchd script
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc)
2007-12-07 23:26:11 -08:00
Jeremy Huddleston
0ad1c359c5 Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa)
2007-12-07 18:54:58 -08:00
Brice Goglin
85ed0bb440 Add a missing linebreak after LoadModule: "foo"
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
2007-12-08 02:53:51 +01:00
Jeremy Huddleston
c238ef06a2 Darwin: Dead coded removal
Kill off assert macro
(cherry picked from commit d6493abedb)
2007-12-07 14:08:31 -08:00
Jeremy Huddleston
8a8239f2e2 Darwin: Renamed DarwinModeBlah to QuartzBlah
(cherry picked from commit 08ebf86d37)
2007-12-05 21:26:16 -08:00
Jeremy Huddleston
bc65a24393 Darwin: Flattened quartz into darwin, renamed darwin xquartz
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbd)
2007-12-05 20:32:40 -08:00
Jeremy Huddleston
e00f7061b2 Darwin: Cleaned up keyboard interface headers
(cherry picked from commit 141f69dc3d)
2007-12-05 20:31:36 -08:00
Andrew Oakley
cb44b6121c Fix commit aa0dfb3f42
From bugzilla bug 13467¹:

Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it.  The patch simply removes the reference to
modeline2c.pl.

1] http://bugs.freedesktop.org/show_bug.cgi?id=13467

Signed-off-by: James Cloos <cloos@jhcloos.com>
2007-12-05 20:23:05 -05:00
Daniel Stone
320abd7d1d XKB: Actions: Don't run certain actions on the core keyboard
Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state.  If we get an action such as VT
switch, just swallow the event.
2007-12-05 19:37:48 +00:00
Hong Liu
c6cfcd408d Bug 13308: Verify and reject obviously broken modes. 2007-12-05 17:48:28 +01:00
Jeremy Huddleston
8d0efe4c2a Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d6)
2007-12-04 18:00:28 -08:00
Jeremy Huddleston
cc98a8e241 Darwin: RIP dumpkeymap, cr, and fullscreen
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes.  If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
(cherry picked from commit e41af2967e)
2007-12-04 16:41:57 -08:00
Adam Jackson
13af2d1efc Restore xf86getsecs() as not having an ANSI equivalent. 2007-12-04 17:36:21 -05:00
Jeremy Huddleston
f8d7729df3 Darwin: Combine launcher and server X11.app
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server.  If arguments are given, we launch the server.  Otherwise if we can
connect to an X DISPLAY, we execute app_to_run.  Otherwise, we launch the server.

(cherry picked from commit e7026216cc)
2007-12-03 20:22:01 -08:00
Dave Airlie
678f786715 xf86crtc: oh mon could be NULL, so check before quirks 2007-12-04 12:24:47 +11:00
Dave Airlie
a9df4bb555 xf86Crtc: pass correct parameter.
quite how this has worked I've no idea.
2007-12-04 12:17:29 +11:00
Adam Jackson
fe25f897c6 xf86getpagesize -> getpagesize elsewhere in os-support/ 2007-12-03 18:34:40 -05:00
Alan Coopersmith
b84f2833a6 xf86getpagesize() -> getpagesize() in os-support/solaris/sun_bios.c 2007-12-03 14:52:46 -08:00
James Cloos
aa0dfb3f42 Remove Perl dependency from the build
From bugzilla bug 13467¹:

The modeline2c script is the only part of the Xorg server that requires Perl.
[This] is a simpler replacement that works with any normal AWK.

1] http://bugs.freedesktop.org/show_bug.cgi?id=13467

Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
2007-12-03 16:57:58 -05:00
Alan Coopersmith
b77ca7cc9c Use _X_EXPORT instead of __attribute__((visibility("default"))) 2007-12-03 11:31:21 -08:00