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

3153 Commits

Author SHA1 Message Date
George Peter Staplin
5d7506c52a XQuartz: pbproxy: Add a comment to pbproxy.h about how the DB() 
macro causes a leak (according to the leaks program).

Attempt to fix several other leaks with release method calls.
For some reason the process still grows more than it should...

I will need to use some better methods than leaks, and malloc_history
I suspect.  Whatever is leaking, it's hard to find.  I need to isolate
the cases more.

Add a missing image/jpeg branch.

Remove read_prop_32 - it's not used.
(cherry picked from commit 63a680354d)
 2008-09-26 12:29:58 -07:00
Jeremy Huddleston
86fa42ed82 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-09-26 12:29:44 -07:00
Jeremy Huddleston
0a55ed3965 XQuartz: 64bit crash fix ... don't pass pointers through xe. 
(cherry picked from commit 5f1265b82e)
 2008-09-21 17:40:08 -07:00
George Peter Staplin
98066a09e4 XQuartz: pbproxy: Add an X error handler that returns 0. 
Move the struct atom_list into the x-selection class, so that it's
no longer a global variable named atoms.  This may ease pthread
integration and reduce the chances of symbols conflicting.
(cherry picked from commit c1403c713c)
 2008-09-21 17:40:05 -07:00
George Peter Staplin
e1b5c9a339 XQuartz: pbproxy: Fix a bug that occured when a PICT format was available. 
We may need another branch to convert a PICT to a PNG or JPEG.  For now
TIFF works well in all of the test image copying apps when converted to
PNG or JPEG with an NSBitmapImageRep class.
(cherry picked from commit adf339d8f9)
 2008-09-21 17:40:03 -07:00
George Peter Staplin
8b66db54be XQuartz: pbproxy: Make the proxy handle copy request races, and PRIMARY 
INCR transfers mixed with a CLIPBOARD change.

Fix a bug with some UTF-8 transfers.  I can only guess that my UTF-8
tests before were inadequate.  I can now copy/paste any characters between
uxterm and Textedit.app.
(cherry picked from commit 7ca1532e8e)
 2008-09-21 17:40:01 -07:00
Jeremy Huddleston
d5ba8a5ca1 XQuartz: "Disable" the text when syncing is disabled. 
(cherry picked from commit 7713d7ab66)
 2008-09-21 17:39:58 -07:00
Jeremy Huddleston
a3095771ea XQuartz: Added a preferences UI for pbproxy options. 
(cherry picked from commit d76cca5e1e)
 2008-09-21 17:39:30 -07:00
George Peter Staplin
e58a1d1d27 XQuartz: pbproxy: Add a missing include of Xutil.h. Another header 
seems to have done this before, but correctness matters.
(cherry picked from commit 1b4987e779)
 2008-09-21 17:38:01 -07:00
George Peter Staplin
f8f5d75303 XQuartz: pbproxy: Add COMPOUND_TEXT handling. Do misc. cleanups with testing 
to verify that the behavior didn't change.

main.m: XInternAtom compound_text, and atom_pair.

pbproxy.h: Add compound_text and atom_pair to the struct atom_list.

x-selection.m: Add an #include of Xutil.h.  Refactor the reply struct
initialization to be done in a common place.  Add send_reply: to simplify
the code a bit more.  Add send_compound_text: which handles the
COMPOUND_TEXT type.  Add the beginnings of a send_multiple:.  Change
handle_image:extension: to handle_image:.  The extension: message isn't
needed anymore.
(cherry picked from commit 1e9460abdf)
 2008-09-21 17:37:59 -07:00
George Peter Staplin
9fdf04b675 XQuartz: pbproxy: pbproxy now responds to selection request events. 
We can now copy and paste images to and from X11.  Text copying and
pasting works as well.

The NSPasteboard can contain TIFF or PICT images, and pbproxy will
translate to an image/png or image/jpeg request, and list those in the
TARGETS.

I added a description of the basic design at the top of x-selection.m.

I removed the request_data x_selection class struct.  It's not needed.
(cherry picked from commit 4a8daf8846)
 2008-09-21 17:37:56 -07:00
George Peter Staplin
dc7af1b000 XQuartz: pbproxy: Use an NSBitmapImageRep to convert an "image/png" selection 
to a TIFFRepresentation for use with NSPasteboard.

This has been tested with the Gimp and works with some minor quartz-wm changes.
The Finder clipboard shows the image updates after an Edit -> Copy.
(cherry picked from commit 12912adaee)
 2008-09-21 17:37:54 -07:00
Jeremy Huddleston
f706f88e4f XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet 
(cherry picked from commit 1317c8ff94)
 2008-09-21 17:37:51 -07:00
George Peter Staplin
a59c231559 XQuartz: pbproxy: The greedy CLIPBOARD handling now works for text. 
This change adds some [self own_clipboard] calls in the necessary places to get the proper greedy behavior.

UTF8_STRING and STRING properties seem to work well now with the test cases (PRIMARY, and CLIPBOARD).  I can copy from several different X apps, and have the behavior be correct when pasting.  I also verified that quartz-wm isn't doing the copying, by disabling the quartz-wm paths.
(cherry picked from commit 934669f732)
 2008-09-21 17:37:49 -07:00
George Peter Staplin
8f663ab452 XQuartz: pbproxy: return the TARGETS list as a 32-bit list to fix a bug that was in the original. 
Add TRACE() calls where appropriate to try to figure out why we are losing CLIPBOARD at times, after transferring PRIMARY to the NSPasteboard.

Use the new pbproxy_clipboard_to_pasteboard where appropriate.
(cherry picked from commit 40190675a6)
 2008-09-21 17:37:47 -07:00
George Peter Staplin
7c21789633 Rename reclaim_clipboard to claim_clipboard. 
Convert the puts usage to use DB().

Add the initial handle_image method.

Check for nil in the NSString instantiation in various places.

Add some commentary to enhance the clarity of why I did some things.
(cherry picked from commit 37361567b6)
 2008-09-21 17:37:44 -07:00
George Peter Staplin
adbe6881c8 Add an image_jpeg Atom. 
(cherry picked from commit ea9dc27977)
 2008-09-21 17:37:42 -07:00
George Peter Staplin
61354ea80d Rename reclaim_clipboard to claim_clipboard. 
(cherry picked from commit d333a8e2b5)
 2008-09-21 17:37:40 -07:00
George Peter Staplin
05db9d6022 Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard. 
(cherry picked from commit 32b175ef62)
 2008-09-21 17:37:37 -07:00
Jeremy Huddleston
981fddf2bf XQuartz: pbproxy: Added global variables to customize how pbproxy behaves 
(cherry picked from commit 21a2d0b8d0)
 2008-09-21 17:37:35 -07:00
Jeremy Huddleston
290e343281 XQuartz: pbproxy: First round of updates to pbproxy from George. 
(cherry picked from commit 5c8b956f8f)
 2008-09-21 17:37:32 -07:00
Jeremy Huddleston
e7487cfc46 XQuartz: Dead code removal 
(cherry picked from commit 43184cd379)
 2008-09-12 15:20:19 -07:00
Jeremy Huddleston
3788d6d786 XQuartz: 256 color support 
(cherry picked from commit 8dd6d5c825)
 2008-09-12 15:20:10 -07:00
Jeremy Huddleston
b62362472c XQuartz: Dead code removal 
(cherry picked from commit bf10fb0b1f)
 2008-09-12 15:19:57 -07:00
Jeremy Huddleston
e55c989cb6 XQuartz: Changed around fd handoff model to be more robust 
(cherry picked from commit 4fe605c2bc)
 2008-09-12 15:19:49 -07:00
Jeremy Huddleston
df2de85c90 XQuartz: Don't warp the pointer on server start for XQuartz 
(cherry picked from commit c0da576d49)
 2008-09-12 15:19:39 -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
5bde9444c8 XQuartz: Dead code removal 
(cherry picked from commit 2e45344870)
 2008-09-12 15:19:14 -07:00
Jeremy Huddleston
448427a231 XQuartz: Fixed proximity logic errors for tablets. 
(cherry picked from commit d942849f24)
 2008-09-12 15:19:05 -07:00
Jeremy Huddleston
d96f2c5978 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-09-12 15:16:16 -07:00
Adam Jackson
f385303cd0 Fix strict-aliasing silliness in XAA. 
(cherry picked from commit 613ce09550)
 2008-09-03 18:58:43 -04:00
Jeremy Huddleston
144746223d XQuartz: Added pasteboard proxy code stripped out of quartz-wm. 
(cherry picked from commit 1f842c71c3)
 2008-09-03 09:23:06 -07:00
Jeremy Huddleston
fafcafd6de XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor 
(cherry picked from commit 6bca787609)
 2008-09-03 09:22:22 -07:00
Jeremy Huddleston
7542c00b96 XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit. 
(cherry picked from commit 2f1e163d5d)
 2008-09-03 09:22:13 -07:00
Jeremy Huddleston
8e3da36b6b XQuartz: Updated man page 
(cherry picked from commit 6932d0d19e)
 2008-09-03 09:19:49 -07:00
Jeremy Huddleston
c1e5ea9ba0 XQuartz: Removed dead code (unused option definitions) 
(cherry picked from commit 3d74f77490)
 2008-09-03 09:19:40 -07:00
Jeremy Huddleston
2cf74a76d5 XQuartz: Cleaned up our sleeping before adding the launchd socket. 
(cherry picked from commit ebfe49dfca)
 2008-09-03 09:19:30 -07:00
Thomas Bodzar
62524d9d76 Xorg.man: typo (the the). 
(cherry picked from commit 229e60db8f)
 2008-09-02 17:57:46 -04:00
Maarten Maathuis
48744d20b1 xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL. 
- Fix is courtesy of math_b.
 2008-08-31 18:14:57 +02:00
Jeremy Huddleston
f6f79ac76f XQuartz: Fixed editing of Applications menu 
(cherry picked from commit da647f1add)
 2008-08-30 16:25:14 -07:00
Jeremy Huddleston
8ad55e484f XQuartz: Fixed missing symbol in quartzKeyboard debugging 2008-08-30 14:19:47 -07:00
Jeremy Huddleston
3739525d57 XQuartz: Don't even build with GLX support since swrast now depends on libdrm 2008-08-30 14:18:07 -07:00
Jeremy Huddleston
73db117012 XQuartz: Placate automake which doesn't like escaped newlines even in comments... 2008-08-29 21:16:19 -07:00
Jeremy Huddleston
4411b8b4de XQuartz: Disable GLX for now, since we don't have a working solution. 2008-08-29 21:01:24 -07:00
Jeremy Huddleston
24aef18e97 XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew. 
(cherry picked from commit aaf0f71db1)
 2008-08-29 20:45:48 -07:00
Jeremy Huddleston
1ecfc492bc XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way. 
(cherry picked from commit 25eccf12c8)
 2008-08-29 20:45:05 -07:00
Jeremy Huddleston
c48b4ddeff Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-29 20:44:55 -07:00
Xavier Bestel
580e96d6d4 Cosmetic fix to EDID decoding. 
(cherry picked from commit bb2cacd33e)
 2008-08-29 14:48:40 -04:00
Jeremy Huddleston
41f99b1021 XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe. 
(cherry picked from commit c8244177b0)
 2008-08-26 23:10:15 -07:00
Jeremy Huddleston
e86de2ac86 XQuartz: Fixed needed xplugin version. >< 
(cherry picked from commit 01b3a99dff)
 2008-08-26 23:10:13 -07:00
Jeremy Huddleston
38e59ad930 XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit. 
(cherry picked from commit e7658e745f)
 2008-08-26 20:19:16 -07:00
Jeremy Huddleston
6685522abe XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it. 
(cherry picked from commit 54a882dcbd)
 2008-08-26 20:19:07 -07:00
Jeremy Huddleston
46b3a5dfd6 XQuartz: Fixed bogus args to debug ErrorF 
(cherry picked from commit f0351c2b80)
 2008-08-26 20:18:59 -07:00
Jeremy Huddleston
cd59eee244 XQuartz: Cleaned up mouse event translation a bit more. 
(cherry picked from commit c286f2a718)
 2008-08-26 20:18:49 -07:00
Jeremy Huddleston
7357dc56c4 Xquartz: Added missing ev_type for NSTabletPoint event. 
(cherry picked from commit 07548f1394)
 2008-08-26 20:18:39 -07:00
Jeremy Huddleston
12c534bf14 XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam. 
(cherry picked from commit fcdc9f8b5a)
 2008-08-26 20:18:27 -07:00
Jeremy Huddleston
f2ec79e4a1 XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts. 
(cherry picked from commit 81187364e5)
 2008-08-20 09:59:23 -07:00
Jeremy Huddleston
fcfc05482a XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu. 
(cherry picked from commit e4110861d3)
 2008-08-20 09:59:05 -07:00
Jeremy Huddleston
a28a2be524 XQuartz: Just cleaned up formatting of event processing code... no "meat" changed... 
(cherry picked from commit 745bc8ab38)
 2008-08-20 09:58:48 -07:00
Jeremy Huddleston
2da32894df XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command 
(cherry picked from commit 02af74d7a5)
 2008-08-20 09:56:19 -07:00
Jeremy Huddleston
ae9c1b3cfb XQuartz: More input fixes 
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
	({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44)
 2008-08-20 09:56:06 -07:00
Jeremy Huddleston
7d9d864461 XQuartz: Updated bundle version to 2.3.1 
(cherry picked from commit eedecba0b8)
 2008-08-20 09:54:29 -07:00
Jeremy Huddleston
79e39470e9 XQuartz: Fixed a stuck modifier key bug. 
(cherry picked from commit eeb6e5a9e9)
 2008-08-14 09:13:26 -07:00
Jeremy Huddleston
01cd463492 XQuartz: Made 3-button mouse simulation a little more consistent. 
(cherry picked from commit d207b037d2)
 2008-08-14 09:13:21 -07:00
Jeremy Huddleston
edf55da280 XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs. 
(cherry picked from commit b287c481e1)
 2008-08-14 09:13:09 -07:00
Jeremy Huddleston
4545ba91e9 XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more... 2008-08-08 01:52:18 -07:00
Jeremy Huddleston
af238e99da Removed rogue #include 2008-08-08 01:41:28 -07:00
Jeremy Huddleston
8894e5312a XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew. 
(cherry picked from commit 5854e712e9)
 2008-08-08 01:20:49 -07:00
Jeremy Huddleston
dfcf7f0db7 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition 
(cherry picked from commit 672682ebf9)
 2008-08-05 18:41:44 -07:00
Jeremy Huddleston
f4da7327d8 XQuartz: Added code and made comments more helpful for debugging first-client-auth bug. 
(cherry picked from commit a8f0d32216)
 2008-08-05 18:40:25 -07:00
Jeremy Huddleston
96be7fd24f XQuartz: Fixed some errors / typos in the preferences pane. 
(cherry picked from commit e1e0c398bb)
 2008-08-05 18:40:21 -07:00
Jeremy Huddleston
ba42abaedd XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize 
(cherry picked from commit d3157ca45c)
 2008-08-05 18:40:16 -07:00
Jeremy Huddleston
1e54d7a8d1 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-05 18:40:03 -07:00
Julien Cristau
db918ea2b0 xfree86: use xorg.conf input devices if there is no ServerLayout 
If xorg.conf has no ServerLayout section, use the first mouse and
keyboard sections as core devices, even with AllowEmptyInput.
(cherry picked from commit 2eaed4a10f)
 2008-08-06 10:34:35 +09:30
Jeremy Huddleston
a20a7eb85e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-05 12:53:36 -07:00
Jeremy Huddleston
a1431499bc XQuartz: Fixed proper processing of tablet button presses 
(cherry picked from commit ca0babafa4)
 2008-08-05 12:51:49 -07:00
Jeremy Huddleston
f40c6631ad XQuartz: Nuke Sparkle. 
(cherry picked from commit 4991f54a8d)
 2008-08-05 12:51:20 -07:00
Jeremy Huddleston
29bce2bb59 XQuartz: Fixed first-client-can't-connect bug 
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153e)
 2008-08-05 12:51:12 -07:00
Peter Hutterer
d199d800a4 xfree86: warn some more about potential missing input devices. 
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
(cherry picked from commit 47160edec7)
 2008-07-29 10:03:07 +09:30
Peter Hutterer
538942cc65 xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now. 
(cherry picked from commit f30b0823db)
 2008-07-29 10:03:07 +09:30
Dodji Seketeli
c217cb96dc [Xephyr] Fix #15839 
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
(cherry picked from commit 5de1867fbb)
 2008-07-23 13:50:48 -04:00
Eamon Walsh
ceffece78b Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type". 
(cherry picked from commit 95d4ede538)
 2008-07-21 17:13:59 -04:00
Dave Airlie
7f542ab37f modes: fix initial xorg.conf mode selection. 
This was all kinds of broken, we ignored user preferred modes for multiple
monitors and also for side-by-side configurations.
(cherry picked from commit 0b9ef835a0)
 2008-07-21 17:08:07 -04:00
Peter Hutterer
0baf677da6 kdrive: don't post motion event if there was no motion. #16179 
Based on the patch by Tomas Janousek. Backported version.

X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
(cherry picked from commit 26e7e69ab8)
 2008-07-17 08:44:39 +09:30
Peter Hutterer
a75cbabc25 Revert "kdrive: don't post motion event if there was no motion. #16179" 
Just because it compiles on my machine doesn't make it right. Needs backported
patch from http://bugs.freedesktop.org/show_bug.cgi?id=16179.

This reverts commit a08ea64ded.
 2008-07-17 08:40:54 +09:30
Peter Hutterer
a08ea64ded kdrive: don't post motion event if there was no motion. #16179 
Based on the patch by Tomas Janousek.

X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
(cherry picked from commit 26e7e69ab8)
 2008-07-16 21:43:22 +09:30
Peter Hutterer
5cb38a3fca 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>
(cherry picked from commit 9ab4e2fd8e)
 2008-07-16 10:32:46 +09:30
Julien Cristau
2b3faf2a75 Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0. 
(cherry picked from commit 9111944b29)
 2008-07-15 10:37:31 -04:00
Peter Hutterer
5b546f1c49 xfree86: append, not prepent, new input devices to xf86InputDevs. 
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.

RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
(cherry picked from commit 11ee0ae939)
 2008-07-14 12:53:28 +09:30
Jeremy Huddleston
e5d4970d4d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-07-11 10:12:55 -07:00
Jeremy Huddleston
fe27bba853 XQuartz: Use CFEqual to compare keyboards 
(cherry picked from commit 5538e43b9a)
 2008-07-11 10:04:08 -07:00
Jeremy Huddleston
0c262e96b0 XQuartz: More fd handoff cleanup. 
(cherry picked from commit 199d2dcb70)
 2008-07-11 10:04:01 -07:00
Jeremy Huddleston
73f41f38c5 XQuartz: Some fd handoff cleanup. 
(cherry picked from commit 9c20a4804d)
 2008-07-11 10:03:53 -07:00
Jeremy Huddleston
7bfdc4bd34 XQuartz: Remove deprecated keyboard code. 
(cherry picked from commit 69cfc1a21e)
 2008-07-11 10:03:41 -07:00
Jeremy Huddleston
f7b8efa23d XQuartz: Set noPanoramixExtension earlier to avoid a possible race. 
(cherry picked from commit 49668e8a88)
 2008-07-11 10:03:17 -07:00
Jeremy Huddleston
9025097f06 Xquartz: Removed include directive for removed header 
(cherry picked from commit e65a36d57f)
 2008-07-11 10:03:09 -07:00
Sascha Hlusiak
c30f36c8c1 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled. 
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway.

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
 2008-07-03 21:42:10 +02:00
Dave Airlie
793ff6754e modes: check the crtc is valid before using its desired modes. 
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
(cherry picked from commit 1771edcb44)
 2008-07-03 19:01:44 +10:00
Dave Airlie
e9f83740e3 cursor: don't dereference NULL pointer is devPrivates not yet set. 
This fixes a bug on server recycle with ati zaphod.
 2008-07-03 18:46:38 +10:00
Adam Jackson
a18551cad1 Fix GLX in Xvfb and kdrive. 
(cherry picked from commit 689292e58c)
 2008-07-02 11:26:10 -04:00
Julien Cristau
81e6ab4851 autoconfig: don't call closedir() when opendir() failed 
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
(cherry picked from commit fbad87f2ae)
 2008-07-01 13:27:54 -04:00
Aaron Plattner
75b5e999f0 Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen. 
RandR 1.1 has a physical size for each mode.  It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration.  The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.

With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode.  The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes.  Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.

This change works around this problem by ignoring the DIX and querying the real
size from the driver.
(cherry picked from commit 2e8daee053)
 2008-07-01 09:08:36 -07:00
Adam Jackson
9ab88bb9b1 Don't try to load DRI2 if built without it. 
(cherry picked from commit e2bbf2d248)
 2008-07-01 12:02:18 -04:00
Adam Jackson
bee463bd8a XInput ABI is 2.1, not 3.1. 
(cherry picked from commit 76576c87b0)
 2008-06-30 16:11:04 -04:00
Adam Jackson
6ec12077ef Distcheck fixes. 2008-06-30 11:17:53 -04:00
Adam Jackson
6e8ed1398d Bump ABI minor numbers for the devPrivate ABI functions. 
(cherry picked from commit 211e2bdcc6)
 2008-06-30 10:31:55 -04:00
George Sapountzis
90f2a82ba5 glx: fix forgotten swrast -> SWRast 
(cherry picked from commit 21a8052fdc)
 2008-06-26 16:14:52 -04:00
George Sapountzis
6e278e3944 glx: missing swrast is fatal 
(cherry picked from commit 877e6c35ff)
 2008-06-26 16:14:52 -04:00
George Sapountzis
6f18c5d703 kdrive: need not export symbols for glx anymore 
(cherry picked from commit ae0504d34d)
 2008-06-26 16:14:52 -04:00
Kristian Høgsberg
cb402b4112 Move the windows GL files to the xwin DDX. 
(cherry picked from commit a8a9b40e55)
 2008-06-26 16:14:51 -04:00
Kristian Høgsberg
0234d3d48f Get out of the mesa symlinking business. 
This copies over the files generated from mesa/src/mesa/glapi.  There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.

The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.

The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
(cherry picked from commit e5aad4bc08)
 2008-06-26 16:14:51 -04:00
Dan Nicholson
d3a2e060bf Fix up paths for GL/glx -> glx renaming 
(cherry picked from commit c76fddeea2)
 2008-06-26 16:14:51 -04:00
Kristian Høgsberg
d325a207c8 Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest. 
(cherry picked from commit f558c7d4d1)
 2008-06-26 16:14:51 -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
Jeremy Huddleston
d88da6638e Moved Apple GL bits into our DDX subtree 
(cherry picked from commit c9356f3289)
(cherry picked from commit d09c520b32)
 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
George Sapountzis
1efc0329b1 glcore: drop GLcore (files) 
(cherry picked from commit a88c6b6646)
 2008-06-26 16:14:50 -04:00
George Sapountzis
9b4d5b6521 glcore: drop GLcore (build system) 
(cherry picked from commit dd7a53f8f2)
 2008-06-26 16:14:50 -04:00
George Sapountzis
1ea2e69cfc 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
(cherry picked from commit 567d389d47)
 2008-06-26 16:14:50 -04:00
Donnie Berkholz
f2c30a57e3 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.
(cherry picked from commit efb723e166)

Conflicts:

	configure.ac
 2008-06-26 16:14:50 -04:00
Adam Jackson
429b2a97a0 Bug #11842: Fix emulation of int1A PCI BIOS services. 
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
(cherry picked from commit 9e5b3deafb)
 2008-06-24 14:10:12 -04:00
Jeremy Huddleston
d451f3d146 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-24 09:36:01 -07:00
Paul Bender
2334ff9bb2 Bug #15665: Fix building without Composite. 
(cherry picked from commit 4c4e06af79)
 2008-06-24 10:45:16 -04:00
Adam Jackson
85e598cc62 Remove some default modes that really shouldn't be in the default set. 
(cherry picked from commit 59510a7643)
 2008-06-24 10:41:27 -04:00
Alan Coopersmith
dfb326790e Restore return type on xf86SetScrnInfoModes 
Seems to have been accidentally lost by commit 	76943fec86
(cherry picked from 925e895b86 commit)
 2008-06-23 19:32:01 -07:00
Jesse Ruffin
4c8a84acf5 Bug #16302: Fix GLX drawable refcounting in DMX. 
(cherry picked from commit 3b58782692)
 2008-06-23 14:35:46 -04:00
Adam Jackson
89d73d7595 Implement bswap in x86emu. 
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
(cherry picked from commit c8d066a151)
 2008-06-23 14:01:15 -04:00
Matthieu Herrb
b0df9a6a42 preserve errno around the SIGIO handler 
(cherry picked from commit 19c7e9da55)
 2008-06-20 13:36:16 -04:00
Adam Jackson
7822a3d05f XAA: Disable offscreen pixmaps by default. 
Say Option "XaaOffscreenPixmaps" to turn them back on.

Apropos of bugs #13795 and #15098.  Not yet applied to master as this wants
a proper solution someday, but then, those bugs aren't closed yet either.
 2008-06-17 16:10:51 -04:00
Ian Romanick
fba700f1f6 Bug #15169: Make the server build again on Alpha. 
Still won't work until the kernel makes the resource files actually exist.

(cherry picked from commit f3490d3eba)
 2008-06-17 10:48:41 -04:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines. 
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
 2008-06-13 16:45:08 -04:00
Dave Airlie
21248705bb modes: make aspect choosing work on single output case. 
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
 2008-06-12 14:54:56 +10:00
Julien Cristau
53a84d75c6 xfree86: fix build on GNU/kFreeBSD 
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
(cherry picked from commit e6cbb1e11e)
 2008-06-12 10:01:41 +10:00
Jeremy Huddleston
0ab483f74e XQuartz: Removed code path for old startup 
(cherry picked from commit a9ee6b0d00)
 2008-06-10 10:51:49 -07:00
Jeremy Huddleston
be616f0f8f XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 
(cherry picked from commit 4505bae5d7)
 2008-06-10 10:51:40 -07:00
Jeremy Huddleston
8e3a85beb9 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it. 
(cherry picked from commit ee92aced10)
 2008-06-10 01:45:57 -07:00
Jeremy Huddleston
a58487db23 XQuartz: Updated icon with more rsolutions and made it more dark-background friendly 
(cherry picked from commit d8cf5623fa)
 2008-06-10 01:45:50 -07:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Paulo Cesar Pereira de Andrade
60990c69b4 Correct a NULL pointer deference 
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a)
 2008-06-09 14:09:39 -04:00
Drew Parsons
c00ff932f8 Disable D-BUS from Xprint. 
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.

Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
(cherry picked from commit 2a3d1421e0)
 2008-06-09 13:57:03 -04:00
Drew Parsons
2f994cb00e 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...).
(cherry picked from commit 966ae1781f)
 2008-06-09 13:56:59 -04:00
Drew Parsons
30774d6b3c 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)
(cherry picked from commit 571206832d)
 2008-06-09 13:56:53 -04:00
Dave Airlie
50e77eb838 int10: add pci_device_enable support on Linux 
(cherry picked from commit ea4ec9e998)
 2008-06-09 13:29:32 -04:00
Jeremy Huddleston
500ace5659 XQuartz: Removed async debugging sleep 
(cherry picked from commit 7812a8bdf9)
 2008-06-04 12:23:12 -07:00
Jeremy Huddleston
677c8d6af7 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling 
(cherry picked from commit ff1c443cad)
 2008-06-04 12:23:06 -07:00
Jeremy Huddleston
9e30e41c6e XQuartz: Don't forget to destroy the mutex and cond after we're done with them 
(cherry picked from commit c3558bb8cd)
 2008-06-04 12:23:00 -07:00
Jeremy Huddleston
469b649e13 XQuartz: Fork for trigger 
(cherry picked from commit dd0f8a0f59)
 2008-06-04 12:22:54 -07:00
Jeremy Huddleston
17fb292b52 XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/ 
(cherry picked from commit 7f840e9dc1)
 2008-06-04 12:22:48 -07:00
Jeremy Huddleston
f060c41843 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-23 02:31:25 -07:00
Jeremy Huddleston
0f44d72873 XQuartz: A 2 second delay for launchd socket connections should be sufficient. 
(cherry picked from commit 2bb4251b3c)
 2008-05-23 02:31:16 -07:00
Jeremy Huddleston
b55226326c XQuartz: Move the launchd display grabbing into mach_startup 
(cherry picked from commit c3866c98d2)
 2008-05-23 02:30:02 -07:00
Jeremy Huddleston
517151d5f4 XQuartz: Fixed a few issues with fd passing... still not working =( 
(cherry picked from commit 7dd3512715)
 2008-05-23 02:29:50 -07:00
Adam Jackson
5efe36f7af Fix reduced-blanking mode filtering in RANDR 1.2. 
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool.  Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
(cherry picked from commit 0178b6a4ab)
 2008-05-19 11:27:58 -04:00
Jeremy Huddleston
86bfcd8d78 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server 
(cherry picked from commit cccee9cfc2)
 2008-05-19 02:47:12 -07:00
Jeremy Huddleston
afc8507e48 XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config 
(cherry picked from commit 2a72309c06)
 2008-05-19 02:47:07 -07:00
Jeremy Huddleston
18a8825adc XQuartz: Cleaned up ListenOnOpenFD... 
(cherry picked from commit 6fb587d3d5)
 2008-05-18 23:32:53 -07:00
Jeremy Huddleston
2147b74126 New XQuartz icon thanks to Simone Karin Lehmann 
(cherry picked from commit c27e0c8f3c)
 2008-05-18 23:32:45 -07:00
Jeremy Huddleston
b6ab42ad39 XQuartz: More work towards Mach-IPC startup... started working on FD passing 
(cherry picked from commit 27fbfeacfa)
 2008-05-18 22:44:50 -07:00
Jeremy Huddleston
b54b2529ad Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-17 14:55:45 -07:00
Jeremy Huddleston
85a6286dcd XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there... 
(cherry picked from commit 301262b070)
 2008-05-17 14:55:38 -07:00
Jeremy Huddleston
1f4d224f82 XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running. 
(cherry picked from commit 543c2cd68d)
 2008-05-17 14:55:31 -07:00
Jeremy Huddleston
3a0fc76ac7 XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed 
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621)
 2008-05-17 14:54:15 -07:00
Jeremy Huddleston
7d39e7e400 XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init. 
(cherry picked from commit 5626b0949b)
 2008-05-17 14:54:10 -07:00
Jeremy Huddleston
880a872498 Xquartz: Xquartz stub now can send Mach IPC to start the server. 
(cherry picked from commit 55a3bca8ea)
 2008-05-17 14:54:04 -07:00
Adam Jackson
0230f39fa3 RANDR 1.1 compat: remove senseless comparison against the virtual size. 
(cherry picked from commit aad1c37b09)
 2008-05-16 11:11:40 -04:00
Adam Jackson
95985256ef xf86SetDesiredModes(): Skip disabled CRTCs first thing. 
(cherry picked from commit 14726b776d)
 2008-05-16 11:11:40 -04:00
Adam Jackson
bedcf98558 Fix initial mode selection even harder. 
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs".  Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
(cherry picked from commit 459f34b089)
 2008-05-16 11:11:40 -04:00
Adam Jackson
bd50c41f6f Redo RANDR compatibility output selection. 
Old logic was just the first one that happened to have an associated
CRTC.  The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
(cherry picked from commit 96111c1547)
 2008-05-16 11:11:40 -04:00
Adam Jackson
0b031442fe Re-add sync range inference from legacy setup to RANDR 1.2. 
(cherry picked from commit a4bbe1c8bc)
 2008-05-16 11:11:39 -04:00
Adam Jackson
cfff55a2bb Fix fbdevhw initialization for PCI drivers. 
graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
(cherry picked from commit 86678e7cc2)
 2008-05-16 10:03:24 -04:00
Jeremy Huddleston
800db31e16 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-14 01:15:43 -07:00
Jeremy Huddleston
f8929b9e5b XQuartz: More work on the Mach-IPC startup path 
(cherry picked from commit 49cd0b185f)
 2008-05-14 01:15:38 -07:00
Jeremy Huddleston
4160d13b48 Xquartz: More work on the new Mach startup 
(cherry picked from commit 6237acf75d)
 2008-05-14 01:15:31 -07:00
Jeremy Huddleston
02744383d5 Added missing to EXTRA_DIST 
(cherry picked from commit e39613f463)
 2008-05-14 01:15:23 -07:00
Jeremy Huddleston
0605c35188 XQuartz: Cleaned up the about box. 
(cherry picked from commit 0279a59706)
 2008-05-14 01:15:15 -07:00
Jeremy Huddleston
1c507cb8bf Don't need the fink-friendly printf in the DDX anymore. 
(cherry picked from commit fe22794404)
 2008-05-14 01:15:06 -07:00
Jeremy Huddleston
c624964539 XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app 
(cherry picked from commit 78032815ae)
 2008-05-12 10:41:58 -07:00
Jeremy Huddleston
5687d51d7e XQuartz: More startup work... listen if we're the actual server 
(cherry picked from commit 3b0afb47c3)
 2008-05-12 10:41:48 -07:00
Jeremy Huddleston
6cb8900736 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support 
(cherry picked from commit 9b67fca9b7)
 2008-05-12 10:41:38 -07:00
Julien Cristau
f2278a882f kdrive: allow disabling Composite 
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
(cherry picked from commit 9dfb525f6c)
 2008-05-11 23:38:03 +02:00
Jeremy Huddleston
e2431ff488 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work. 
(cherry picked from commit 2232c91d5c)
 2008-05-08 19:57:48 -07:00
Jeremy Huddleston
d6cf35fc56 XQuartz: Set bundle version to 2.3.0 
(cherry picked from commit 8a0524b30e)
 2008-05-08 19:57:17 -07:00
Jeremy Huddleston
561ece68ea XQuartz: Fixed some issue in our bundle creation 
(cherry picked from commit 330ffad547)
 2008-05-08 19:56:29 -07:00
Jeremy Huddleston
50ce5f2083 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-08 19:55:25 -07:00
Adam Jackson
64948dc667 Bug #13104: Remove broken XAA a1 glyph fast path. 
(cherry picked from commit f17ba5d584)
 2008-05-08 16:12:01 -04:00
Adam Jackson
f2aa0000a2 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.
(cherry picked from commit 718652eaf9)
 2008-05-08 16:09:56 -04:00
Jeremy Huddleston
4f0a975d02 XQuartz: Fixed typo 
(cherry picked from commit 56b7988d26)
 2008-05-06 03:04:30 -07:00
Jeremy Huddleston
1764a6a651 XQuartz: Added uncommitted files 
(cherry picked from commit e414ec462c)
 2008-05-06 03:04:27 -07:00
Jeremy Huddleston
5bac727e06 Fixed up dist 
(cherry picked from commit f225222ba2)
 2008-05-06 03:04:23 -07:00
Jeremy Huddleston
89e8654ba4 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:31 -07:00
Ben Byer
62601cfc1f Xquartz: experimental embedding of Sparkle.framework 
(cherry picked from commit b7a1a640ce)
 2008-05-06 02:49:22 -07:00
Jeremy Huddleston
b8ed63740d 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:28 -07:00
Jeremy Huddleston
eb9187cb08 XQuartz: Avoid a possible crash at startup due to unfavorable context switching. 
(cherry picked from commit ff10c37bdd)
 2008-05-02 17:42:19 -07:00
Jeremy Huddleston
f93f835588 XQuartz: Adjust the screen origin offset properly for multimonitor setups 
(cherry picked from commit f2020b9836)
 2008-05-01 18:04:23 -07:00
Jeremy Huddleston
51925ed0db XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h 
(cherry picked from commit 1fcf74a436)
 2008-04-30 17:32:55 -07:00
Jordan Crouse
fd0ec73bcb xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode' 
(cherry picked from commit 4fa89fbe18)
 2008-04-30 11:51:08 +03:00
Ben Byer
cc58f22037 xquartz: created darwinTablet, to represent tablet events 
(cherry picked from commit 50641bce73)
 2008-04-29 23:59:02 -07:00
Ben Byer
1f2dc202bd xquartz: remove unused params from DarwinEQInit 
(cherry picked from commit 299a056737)
 2008-04-29 23:58:55 -07:00
Jeremy Huddleston
c6edfc2cab 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:58:47 -07:00
Jeremy Huddleston
dd876f2c59 XQuartz: Unset CFProcessPath... blech 
(cherry picked from commit ce4fbfbc75)
 2008-04-28 15:55:06 -07:00
Jeremy Huddleston
2500818656 XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m) 
(cherry picked from commit 22cf724376)
 2008-04-28 15:39:40 -07:00
Jeremy Huddleston
1448fed9b6 XQuartz: Disabled DPMS extension 2008-04-28 15:39:02 -07:00
Jeremy Huddleston
080a4eb9b6 XQuartz: Added thread debugging to xprFrame.c 
(cherry picked from commit 41542502b3)
 2008-04-28 15:29:32 -07:00
Jeremy Huddleston
cf5a4210a4 XQuartz: More startup / threading house cleaning. 
(cherry picked from commit 72653c24c0)
 2008-04-28 11:49:07 -07:00
Jeremy Huddleston
ab5abdc7af XQuartz: Updated Localizable.strings 
(cherry picked from commit d8d9c866b9)
 2008-04-28 11:48:59 -07:00
Jeremy Huddleston
1545be4b57 XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST 
(cherry picked from commit 03e707987f)
 2008-04-28 11:48:52 -07:00
Jeremy Huddleston
5ecd552e19 Xquartz: Added missing to EXTRA_DIST 
(cherry picked from commit f4b963256f)
 2008-04-26 23:19:43 -07:00
Jeremy Huddleston
90c4fd7a49 XQuartz: Cleaned up startup and thread creation a tad. 
(cherry picked from commit c861fe00e1)
(cherry picked from commit ef1c520537)
 2008-04-26 19:21:18 -07:00
Jeremy Huddleston
4a811c665a XQuartz: Don't subtract the titlebar off of the pointer_y 
(cherry picked from commit 00a9567acc)
 2008-04-26 17:05:38 -07:00
Jeremy Huddleston
631e2986f1 XQuartz: Added some pseudoramiX debug traces 
(cherry picked from commit 5bee1585a3)
(cherry picked from commit 5c6aa1272e)
 2008-04-25 18:01:55 -07:00
Jeremy Huddleston
40514b3cc7 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:14 -07:00
Jeremy Huddleston
730e2a5ac3 XQuartz: Cleaned up multi-monitor support. 
(cherry picked from commit c05abf0a19)
(cherry picked from commit 9112f29043)
 2008-04-24 23:50:08 -07:00
Jeremy Huddleston
c9356f3289 Moved Apple GL bits into our DDX subtree 2008-04-23 10:13:50 -07:00
Jeremy Huddleston
41ed532525 XQuartz: No need to include indirect.c a second time 2008-04-23 09:59:48 -07:00
Ben Byer
821d7400f2 xquartz: clean up linker line for main binary 2008-04-23 03:40:31 -07:00
Jeremy Huddleston
824b31c7f8 XQuartz: Make sure QuartzAudioInit() gets run. 
(cherry picked from commit bb3d034675)
 2008-04-23 02:22:14 -07:00
Jeremy Huddleston
b9b2d028d2 XQuartz: Fixed cmd-tab to bring all windows forward. 
(cherry picked from commit e48e2ce931)
 2008-04-21 23:44:52 -07:00
Jeremy Huddleston
b43ead0cfd XQuartz: Fixed quit dialog to be more conforming with HIG. 
(cherry picked from commit 14c6b837bb)
 2008-04-21 19:08:24 -07:00
Ben Byer
062c8e9f6e Fix for pointer-offset issue when using a multi-display environment on X11.app. 
(cherry picked from commit 9a7e14286c)
 2008-04-21 17:54:48 -07:00
Jeremy Huddleston
d013c23f37 XQuartz: Cleanup turning off COMPOSITE 
(cherry picked from commit 8f920fca6f)
 2008-04-20 01:24:45 -07:00
Jeremy Huddleston
d16f097f89 XQuartz: Cleaned up some casting to get rid of compiler warnings 
(cherry picked from commit 6f1c85b965)
 2008-04-20 01:24:39 -07:00
Jeremy Huddleston
45ebee4f72 Last of the spam... I promise... 2008-04-18 20:30:43 -07:00
Jeremy Huddleston
c6a2c6928b XQuartz: More sanitization of the namespace 
(cherry picked from commit bc50d41f9d)
 2008-04-18 20:26:20 -07:00
Jeremy Huddleston
45ff59e69e XQuartz: Removed unneccessary include 2008-04-18 20:10:57 -07:00
Jeremy Huddleston
8cb23d6721 XQuartz: Handled sanitization of namespace better 2008-04-18 20:06:17 -07:00
Jeremy Huddleston
5cef157d9d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-04-18 17:23:23 -07:00
Ben Byer
7fb9b2dc61 random flailing 2008-04-18 17:17:01 -07:00
Jeremy Huddleston
a918657f89 XQuartz: Forgot to commit xprEvent.[hc] ... 
(cherry picked from commit 70e543baf2)
 2008-04-17 20:31:18 -07:00
Ben Byer
2e2b95053e Added XKB support for Xquartz 
(cherry picked from commit 56dc121520)
 2008-04-17 17:25:59 -07:00
Jeremy Huddleston
d4859484a4 XQuartz: Moved some rootless-specific cruft into xpr 
(cherry picked from commit 31625cc03b)
 2008-04-17 15:50:14 -07:00
Jeremy Huddleston
d9729fbe58 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:24 -07:00
Jeremy Huddleston
719d415a6c XQuartz: A little more debugging output from threadSafety 
(cherry picked from commit f6fbdbf838)
 2008-04-17 15:24:14 -07:00
Jeremy Huddleston
d9f456adfc XQuartz: Fixed some missing prototypes 
(cherry picked from commit 95056afc56)
 2008-04-17 13:20:56 -07:00
Jeremy Huddleston
e1a4eef65e XQuartz: Added framework for asserting which thread we're in. 
(cherry picked from commit 00beb98251)
 2008-04-17 13:20:49 -07:00
Jeremy Huddleston
e4218388fa XQuartz: Include version info for CrashReporter 
(cherry picked from commit b4992755c3)
 2008-04-17 11:57:47 -07:00
Jeremy Huddleston
20583a9a5a XQuartz: Use strerror(errno)... cause I like text more than grepping header files 
(cherry picked from commit 1b4c37d8f9)
 2008-04-17 11:07:18 -07:00
Jeremy Huddleston
dff2b65cc5 merged darwinKeyboard.[ch] into quartzKeyboard 
(cherry picked from commit 57bb073209)
 2008-04-17 11:03:13 -07:00
Ben Byer
de858ca3b8 oops, missed a spot 
(cherry picked from commit 19872a6aeb)
 2008-04-17 10:40:29 -07:00
Ben Byer
40939252d1 formatting cleanup 
(cherry picked from commit 769acd2934)
 2008-04-17 10:40:16 -07:00
Ben Byer
f8cee2ebae delete debugging spew 
(cherry picked from commit f04f3af86a)
 2008-04-17 10:40:08 -07:00
Ben Byer
96459ad45d add support for horizontal scrolling (buttons 6 and 7) 
(cherry picked from commit f525a4a432)
 2008-04-17 10:40:02 -07:00
Ben Byer
3af6960f12 enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm 
(cherry picked from commit ab662c736e)
 2008-04-17 10:39:54 -07:00
Ben Byer
0e61265f38 darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx 
(cherry picked from commit a8a090b853)
 2008-04-17 10:39:47 -07:00
Ben Byer
514b5dd7a7 hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels 
(cherry picked from commit cab54466a6)
 2008-04-17 10:39:38 -07:00
Ben Byer
3438178115 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:39:30 -07:00
Jeremy Huddleston
c697c1dad3 XQuartz: Don't enable rootless accelerated functionality... crashy... 
(cherry picked from commit cdb4c291d8)
 2008-04-16 23:14:01 -07:00
Jeremy Huddleston
01a931c313 XQuartz: Don't use composite. 
(cherry picked from commit 6d3d344b5b)
 2008-04-16 21:52:54 -07:00
Jeremy Huddleston
11c71ae243 Xquartz: Don't need to link against rlAccel since we don't use it 
(cherry picked from commit 180ec128ad)
 2008-04-16 21:51:22 -07:00
Jeremy Huddleston
793b828dc7 XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread 
(cherry picked from commit cb27d5ca82)
 2008-04-15 12:05:20 -07:00
Kristian Høgsberg
5a2b538c1b Make DRI2 a serverlayout/serverflags option. 
Add xf86DRI2Enabled() to export the value of the setting.
(cherry picked from commit 35982bc109)
 2008-04-15 11:48:33 +10:00