Commit Graph

2558 Commits

Author SHA1 Message Date
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
Adam Jackson
1faba797cb Death to libcwrapper.
This has been deprecated since 1.1.  Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
Peter Hutterer
28b93d74a1 ephyr: miPointerWarpCursor needs the device parameter.
Thanks to Mitchell Quille for spotting it.
2007-12-03 14:35:33 +10:30
Ben Byer
83ba1e167c added missing call to xcb_connect()
(cherry picked from commit dc2fb323ee)
2007-12-01 19:04:06 -08:00
Jeremy Huddleston
9ad4560b3c Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
(cherry picked from commit 8a76c99c0e)
2007-12-01 17:27:36 -08:00
Jeremy Huddleston
f83d758dcc Darwin: properly implemented xcb check for stale sockets
(cherry picked from commit f543cb8fbb)
2007-11-30 16:11:15 -08:00
Jeremy Huddleston
f54b28eeba Darwin: Undo focus-hack which didn't work right. 2007-11-30 16:09:23 -08:00
Dave Airlie
f30abe30c5 edid quirk for MAX 0x77e monitor
From RH bugzilla 306441
2007-11-30 13:53:21 +10:00
Jeremy Huddleston
8a079be0dd Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.
(cherry picked from commit d2b768890f)
2007-11-29 02:21:16 -08:00
Jeremy Huddleston
3839756061 Darwin: Removed support for darwinSwapAltMeta
(cherry picked from commit 3d153c8fa4)
2007-11-29 02:21:16 -08:00
Dave Airlie
89c3dfe41e modes: use xf86RandR12Index to stop illegal access
xf86RandR12Index set to -1, and if initialised it gets 0 or higher.
This allows the server to start with xinerama turned on with only one head
2007-11-29 19:57:24 +11:00
Dave Airlie
725710fd0b randr: make randr code not segfault when xinerama set 2007-11-29 19:40:53 +11:00
Adam Jackson
23b8ca8a37 RANDR 1.2: Only enable unknown outputs if there are no connected outputs.
Otherwise you end up with a confusing initial geometry, and xscreensaver
and friends get very angry.
2007-11-27 13:20:40 -05:00
Jeremy Huddleston
601307615e Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b)
2007-11-26 14:49:32 -08:00
Eamon Walsh
54cb729ecc registry: Add a call for DTRACE compatibility. 2007-11-26 15:59:01 -05:00
Eamon Walsh
decd5a7c60 registry: Rebase registry to use the server config file of protocol names. 2007-11-26 15:26:49 -05:00
Adam Jackson
a344920ae8 Allow Virtual to be specified globally in the Screen section.
The Display subsections are optional, and it's confusing to need to create
them just to set a Virtual size.
2007-11-26 11:53:08 -05:00
Matthias Hopf
c6c284e64b Initialize Mode with 0 in xf86RandRModeConvert.
Asking for trouble if non-initialized values contain random data.
2007-11-26 15:39:42 +01:00
Matthias Hopf
f6401f944d Don't segfault if referring to a relative output where no modes survived. 2007-11-23 16:14:48 +01:00
Matthias Hopf
fa19e84714 Fix initial placement of LeftOf and Above. 2007-11-23 16:14:48 +01:00
Matthias Hopf
184e571957 Adjust offsets of modes that do not fit virtual screen size.
Fixes memory corruption if a too small "Virtual" was specified in xorg.conf
for the selected multi-monitor configuration.
2007-11-23 16:14:48 +01:00
Jeremy Huddleston
63351df0ee Darwin: Fix compilation/linking problems 2007-11-22 18:02:07 -08:00
Jeremy Huddleston
bf4ef4da75 Darwin: Remove the PaintWindow optimization which snuck back in. 2007-11-22 17:45:15 -08:00
Jeremy Huddleston
59c7ca6586 Darwin: Added missing Makefile.am 2007-11-22 13:29:15 -08:00
Jeremy Huddleston
23596291c3 Darwin: More syncing witn xorg-server-1.2-apple 2007-11-22 13:17:44 -08:00
Jeremy Huddleston
ed9524d36e Darwin: Copied over missing file (Localizable.strings) from xorg-server-1.2-apple 2007-11-22 01:07:02 -08:00
Jeremy Huddleston
4d9cef197b Darwin: Misc cleanups to line up with xorg-server-1.2-apple 2007-11-22 00:35:09 -08:00
Jeremy Huddleston
5e950123da Darwin: Removed cvs tags from Xquartz man page 2007-11-21 23:32:00 -08:00
Jeremy Huddleston
3a2f714eea Darwin: Removed .svn dir 2007-11-21 23:30:37 -08:00
Jeremy Huddleston
602de4f70b Darwin: Use UTF8String since lossyCString is deprecated
(cherry picked from commit 1786f9464a)
2007-11-21 23:27:17 -08:00
Ben Byer
13666e287c Darwin: Added some DEBUG_LOG sauce to the XP_EVENT handling code
(cherry picked from commit ec84a4cef6)
2007-11-21 23:26:15 -08:00
Ben Byer
829b6641bd Darwin: Disabled ALT_IS_MODE_SWITCH
(cherry picked from commit fd181254f8)
2007-11-21 23:23:44 -08:00
Ben Byer
8486f8af91 Darwin: Added a lightweight debugging facility to support troubleshooting
(for example) the stuck modifier key issue
(cherry picked from commit 0e0b452d10)
2007-11-21 23:18:46 -08:00
Ben Byer
8358334180 Darwin: Fixed the call to xp_init so that we now receive Motion notifications even
if X is not the active application.
fixes <rdar://problem/5167664> xeyes dead until window activation
(cherry picked from commit c7573379a8)
2007-11-21 23:16:27 -08:00
Ben Byer
512dee9087 Darwin: fix for spurious "Are you sure you want to quit?" message
(cherry picked from commit 30cbfc786e)
2007-11-21 23:15:26 -08:00
Ben Byer
28e73e99a9 Darwin: Adding "fake RandR" support from old X11.app
(cherry picked from commit 633490c4e8)
2007-11-21 23:14:21 -08:00
Ben Byer
01b70afaac Darwin: Initial support for Spaces -- if you use Expose to drag an X11
window to another Space, it will work correctly (as opposed
to just leaving a ghost window).  We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
(cherry picked from commit 2d50ea8013)
2007-11-21 23:13:48 -08:00
Ben Byer
b39edc01a6 Darwin: Swap modifier keys for buttons 2 and 3 -- now Option-click is the middle click
(cherry picked from commit 0aa61293b6)
2007-11-21 23:12:15 -08:00
Ben Byer
606a8dc73d Darwin: Trap Deactivate messages and release modifiers to avoid "stuck shift lock" (etc) bugs
(cherry picked from commit 2b189a9933)
2007-11-21 23:12:01 -08:00
Ben Byer
4c18ef4331 Darwin: Workaround for a bug where the holding down Command to make a "fake"
button 2 click would actually result in a Command-2 chord.
(I.e. it wasn't releasing Command before clicking the fake button.)
(cherry picked from commit 0d5dd5dffa)
2007-11-21 23:11:38 -08:00
Peter Hutterer
f9269bebae DeviceIntRec: move lastx/lasty from valuator into DeviceIntRec.
We free the ValuatorClassRec quite regularly. If a SIGIO is handled while
we're swapping device classes, we can bring the server down when we try to
access lastx/lasty of the master device.
2007-11-22 17:30:14 +10:30
Jeremy Huddleston
7f2972d47a Darwin: Really add launcher this time 2007-11-21 21:59:59 -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
a541e826c9 Revert "registry: Register WINDOWSWM extension protocol names."
This reverts commit 4c3285c883.

Moving all the names into dix/registry.c
2007-11-20 17:50:26 -05:00
Eamon Walsh
993595430b Revert "registry: Register XF86DRI extension protocol names."
This reverts commit b778672408.

Moving all the names into dix/registry.c
2007-11-20 17:48:46 -05:00
Eamon Walsh
6b73c215c9 Revert "registry: Register XF86VidMode extension protocol names."
This reverts commit 960677e876.

Moving all the names into dix/registry.c
2007-11-20 17:47:30 -05:00
Eamon Walsh
8e2cd7a804 Revert "registry: Register XF86Misc extension protocol names."
This reverts commit 2cd1b32b77.

Moving all the names into dix/registry.c
2007-11-20 17:45:30 -05:00
Eamon Walsh
0356153a58 Revert "registry: Register XF86DGA extension protocol names."
This reverts commit 3815284e89.

Moving all the names into dix/registry.c
2007-11-20 17:43:18 -05:00
Eamon Walsh
de93c1e9df Revert "registry: Register DMX extension protocol names."
This reverts commit 32f3f5a1e7.

Moving all the names into dix/registry.c
2007-11-20 17:40:57 -05:00
Eamon Walsh
2d3e0cdf4b Revert "registry: Register APPLEDRI extension protocol names."
This reverts commit 3464b41923.

Moving all the names into dix/registry.c
2007-11-20 17:39:56 -05:00
Eamon Walsh
546d46224e Revert "registry: Register XINERAMA extension protocol names."
This reverts commit b9f5ab98c8.

Moving all the names into dix/registry.c
2007-11-20 17:37:48 -05:00
Eamon Walsh
fd2d83d5bf Revert "registry: Register APPLEWM extension protocol names."
This reverts commit eee46b4681.

Moving all the names into dix/registry.c
2007-11-20 17:34:48 -05:00
Dodji Seketeli
be0cbe5a33 kaa: update kaaCreatePixmap to support the new usage_int 2007-11-20 15:39:49 +01: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
Michel Dรคnzer
ea9c63e93b DEFAULT_DPI was undefined here. 2007-11-19 15:53:49 +01:00
Adam Jackson
db9ae86353 Bump DEFAULT_DPI to 96.
75 is just nonsense.
2007-11-18 11:57:01 -05:00
Tormod Volden
ee2d4626dc Bug #12932: Use DEFAULT_DPI in randr1.2 instead of hardcoded 96. 2007-11-18 11:56:31 -05:00
Adam Jackson
d15339a92c Bug #9725: Don't look in root's $HOME for config files, that's just confusing. 2007-11-17 22:12:10 -05:00
Aaron Plattner
f797c96845 Save pixmap allocation hints into the PixmapRec. 2007-11-15 12:21:25 -08:00
Adam Jackson
6bc50de021 Simplify system resource range setup.
osRes only existed to get copied into Acc.  Waste of effort.
2007-11-15 15:03:58 -05:00
Adam Jackson
e1ff14a924 Delete some dead code in X -configure. 2007-11-15 14:45:49 -05:00
Adam Jackson
c67b9c5fc3 Clean up some garbage in driver enumeration. 2007-11-15 14:24:36 -05:00
Adam Jackson
0706e5e790 Eliminate some redundancy in autoconfiguration.
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
2007-11-15 14:15:09 -05:00
Adam Jackson
2c01a49bf0 Don't sleep(1) at exit on any platform. 2007-11-15 13:32:59 -05:00
Tiago Vignatti
4c9cc82fc4 For some reason "-nozap" appeared twice. Weird. 2007-11-15 01:46:11 -02:00
Adam Jackson
cecac79445 Don't sleep(1) at server exit. 2007-11-14 14:46:22 -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
338c1aedbd formatting fixes 2007-11-08 20:41:47 -08:00
Ben Byer
bd269d0d78 Fix for off-by-one error in menu bar height calculation -- props to Nicholas Riley! 2007-11-08 20:39:08 -08:00
Ben Byer
b4d1448405 Undo some last-minute breakage in xpr.h 2007-11-08 20:38:02 -08:00
Ben Byer
05d5b9baa0 removed debugging output 2007-11-08 20:37:38 -08:00
Ben Byer
9a8abcfa6d Fixed focus problem (clicking on an X11 window that sits behind
an Aqua window would not always bring it to the top of the stack.
2007-11-08 20:37:18 -08:00
Ben Byer
b34d2ffc38 formatting changes. 2007-11-08 20:37:04 -08:00
Ben Byer
50dac9b2cb Fixed Spaces issue, correctly -- dragging an X window from one
Space to another in Expose mode now works.
2007-11-08 20:11:34 -08:00
Ben Byer
a6ac900295 formatting cleanup 2007-11-08 20:06:05 -08:00
Ben Byer
67e96be13c Fixed logic error that prevent JIS (Japanese) keyboard layouts from
being detected.
2007-11-08 20:04:44 -08:00
Ben Byer
154fb6417e Initial support for Spaces -- if you use Expose to drag an X11
window to another Space, it will work correctly (as opposed
to just leaving a ghost window).  We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
2007-11-08 20:04:03 -08:00
Ben Byer
169f83e366 Disable deferred updates in xp_init to fix performance problems
-- thanks to Eric Gouriou for pointing out the issue
2007-11-08 20:00:55 -08:00
Peter Hutterer
184a7b8917 Merge branch 'mpx' into mdsd
Conflicts:

	Xi/opendev.c
2007-11-08 09:34:35 +10:30
Dodji Seketeli
e94ab0b502 sync with 'master' 2007-11-07 19:05:38 +01:00