Commit graph

5427 commits

Author SHA1 Message Date
Jeremy Huddleston
02a05bbdf2 XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
(cherry picked from commit bcb83eea72)
2008-10-15 17:31:40 -07:00
Jeremy Huddleston
42d1454507 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-08 18:43:55 -07:00
Jeremy Huddleston
d039c05b1f XQuartz: Some motion made towards supporting fullscreen.
(cherry picked from commit 99be3d68b6)
2008-10-08 18:43:42 -07:00
Jeremy Huddleston
4915d88858 XQuartz: Fixed EXTRA_DIST for new GL files.
(cherry picked from commit a11c905203)
2008-10-08 18:43:31 -07:00
George Staplin
1953956be8 XQuartz: GL: setVisualConfigs() copied the behavior of indirect.c which is wrong, with regard to the handling of xcalloc failure.
Use ErrorF for an error message after an xcalloc failure, and return instead of falling through to GlxSetVisualConfigs, or abort()ing at the test branch.
(cherry picked from commit 1056700971)
2008-10-08 18:43:20 -07:00
Jeremy Huddleston
3ea371c9e5 XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
(cherry picked from commit 97173d4eda)
2008-10-08 18:43:10 -07:00
George Staplin
e2655ab188 XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
(cherry picked from commit 190a3d5e5d)
2008-10-08 18:41:51 -07:00
George Staplin
cb19d0faec XQuartz: GL: Add the new C code to the Makefile.am.
Commit the darwin.c changes I missed in the last commit, for calling
setVisualConfigs().
(cherry picked from commit eb3c014e17)
2008-10-08 18:41:39 -07:00
George Staplin
b6eddd80a4 XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
(cherry picked from commit fc86f9e448)
2008-10-08 18:41:29 -07:00
Jeremy Huddleston
3dd6d78fd5 Xquartz: Fix parallel builds
(cherry picked from commit 1fe7298a3b)
2008-10-08 18:41:20 -07:00
Julien Cristau
ca659813a8 Fix GKVE with key_code > 255
Move the keycode validation checks before use.
2008-10-08 19:46:50 +02:00
Luc Verhaegen
8337c9aa3d DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
Fixes a segfault when trying to activate a DGA mode without checking
whether DGA modesetting is at all possible.
(cherry picked from commit 1feb69eb63)
2008-10-08 11:21:49 -04:00
Zhenyu Wang
4e6cbd3238 Check nextEnabledOutput()'s return in bestModeForAspect()
In case no enabled outputs, we will reference wrong index of
output array.
(cherry picked from commit 56c615368c)
2008-10-08 11:21:39 -04:00
Adam Jackson
43e3af9cac int10: Fix a nasty memory leak.
(cherry picked from commit 94919480d8)
2008-10-08 11:16:56 -04:00
Adam Jackson
00ac80a0c4 int10: Don't warn when scanning for devices we don't have.
Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking
for the config space of every possible device number.  This despite
perfectly functional BIOS methods to enumerate the bus exactly.
(cherry picked from commit a57b2f172c)
2008-10-08 11:16:52 -04:00
Adam Jackson
c6ce2f6b3f int10: Remove useless check.
If you have more than one PCI device with the same d/b/d/f, you're
already in trouble.
(cherry picked from commit a65e36a873)
2008-10-08 11:16:48 -04:00
Eamon Walsh
8ef37c194f Array-index based devPrivates implementation.
Note: DevPrivateKey is now pointer-to-int, which means
each key now needs to point to some global storage of
size at least sizeof(int).

(cherry picked from commit b6ab114212)
2008-10-08 11:15:27 -04:00
Peter Hutterer
e88df87851 xkb: squash canonical types into explicit ones on core reconstruction.
If we update key types from core, and groups 2 - n have a canonical type but
the same symbols as the explicit type of group 1, assume that it was a core
sym duplication according to Section 12.4 of the XKB Protocol Spec.
Ignore the canonical types and pretend there's only one group for the key -
with the explicit key type.

The protocol spec does not cover this case, so we have to guess here.
(cherry picked from commit 30c3c13f10)
2008-10-08 11:15:21 -04:00
Peter Hutterer
be3b3cb970 xkb: fix core keyboard map generation. #14373
According to Section 12.4 of the XKB Protocol Spec, if a key only has a single
group but the keyboard has multiple groups defined, the core description of
the key is a duplication of the single group across all symbols. i.e.
G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4

The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to
"invented" groups when the process is reversed.

Note that this creates wrong key types on reconstruction from core to xkb,
i.e. any single-group key with a key type that is not one of the canonical
four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type
for the other gruops.

X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
(cherry picked from commit ae986d1c73)
2008-10-08 11:15:13 -04:00
Kim Woelders
3bf826f590 xkb: fix use of uninitialized variable.
And some cosmetic changes to use stuff->change consistently.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 8c46505d7d)
2008-10-08 11:15:05 -04:00
Jeremy Huddleston
e592e48538 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-07 10:08:22 -07:00
Jeremy Huddleston
9a659f9355 Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH
(cherry picked from commit 6dbfca571f)
2008-10-07 10:08:14 -07:00
Alan Coopersmith
88ebde608d Remove usage of mfbChangeWindowAttributes missed in e4d11e58c... 2008-10-06 20:10:25 -07:00
Jeremy Huddleston
9980180abc XQuartz: Bumped bundle version to 2.3.2 for beta1
(cherry picked from commit 2021c4c4e7)
2008-10-04 21:16:22 -07:00
Jeremy Huddleston
56f5e8238b XQuartz: pbcopy: Re-enabled some code I commented out for testing
(cherry picked from commit 9b5d114092)
2008-10-04 21:16:18 -07:00
Jeremy Huddleston
55d7956f11 XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
(cherry picked from commit f7673bb4de)
2008-10-04 21:16:10 -07:00
Jeremy Huddleston
cc228b8869 XQuartz: GLX - enable_stereo defaults option should work now
(cherry picked from commit 3a6898f487)
2008-10-04 21:15:54 -07:00
Jeremy Huddleston
1f205c6e00 Partially reverts commit 207ba1783b.
git-cherrypick nuked fbwindow.c, so here it is back
2008-10-03 11:25:53 -07:00
George Peter Staplin
901c75722c XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
instead of calling CFRunLoopRun() directly.  The leak wasn't reproducible on
this machine, but someone was able to produce a leak trace with Instruments
that indicates it was leaking in the CFRunLoopRun() path.

x-input.m: dequeue and ignore events when pbproxy_active is false.

x-selection.h: add an is_active method that is used by x-input.m to ignore
events.

x-selection.m: Handle nearly every preference, except for primary_on_grab,
which I don't really understand yet.
(cherry picked from commit 4d51ad851e)
2008-10-03 11:14:18 -07:00
Jeremy Huddleston
459280477a XQuartz: Use "pointer" and "pen" for device names to please GDK.
(cherry picked from commit 00ca0f4d83)
2008-10-03 11:14:11 -07:00
Jeremy Huddleston
5a369fe938 XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
(cherry picked from commit 9a91d770a6)
2008-10-03 11:14:04 -07:00
Jeremy Huddleston
c22ac57a78 XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
(cherry picked from commit d79ccb45f6)
2008-10-03 11:13:59 -07:00
Jeremy Huddleston
938cf097dd XQuartz: Removed resolved comment about localization.
(cherry picked from commit 8ed5faf058)
2008-10-03 11:13:52 -07:00
George Peter Staplin
91aeabff15 XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
Remove some unnecesssary headers.

Remove some dead code that was never called or used in pbproxy.

Make use of an NSAutoreleasePool in x_init.  It could potentially cause a leak
on a startup without this.

Start adding reload_preferences to the x_selection class, as well as event
handling for that.
(cherry picked from commit 602e8ba8f7)
2008-10-03 11:13:44 -07:00
Jeremy Huddleston
b2d9b0d067 XQuartz: Added some localizable strings that were missing.
(cherry picked from commit 2c8205ea8b)
2008-10-03 11:13:37 -07:00
Jeremy Huddleston
c3d15e1b6d XQuartz: Actually send the pointer event from the pen even if it happes to actually have 0 pressure and 0 tilt.
(cherry picked from commit f415837619)
2008-10-03 11:10:25 -07:00
Jeremy Huddleston
95967f1f32 Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
(cherry picked from commit c2012138a5)
2008-10-03 11:10:15 -07:00
Jeremy Huddleston
f0b49cdc2e XQuartz: Send AppleWMReloadPreferences where appropriate.
(cherry picked from commit 490cbe9888)
2008-10-03 11:10:06 -07:00
Jeremy Huddleston
88033a66a5 XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c)
2008-10-03 11:09:26 -07:00
Jeremy Huddleston
207ba1783b Added dep on applewmproto 1.1.0
(cherry picked from commit b350b06674)
2008-10-03 11:08:39 -07:00
George Peter Staplin
0e089bdbc1 XQuartz: pbproxy: Fix another STRING bug.
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error.  So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e7)
2008-09-26 12:30:54 -07:00
George Peter Staplin
191d6656a0 XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly.
(cherry picked from commit 82a4dc5f0f)
2008-09-26 12:30:46 -07:00
Jeremy Huddleston
cbc9389dd3 XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071)
2008-09-26 12:30:36 -07:00
Jeremy Huddleston
d5db51954f XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b8)
2008-09-26 12:30:29 -07:00
George Peter Staplin
37f023c59f XQuartz: pbproxy: Fix 3 paths that could leak memory.
2 of the paths leaked, when INCR transfers were done.  Now we
are leak free according to the leaks program for all transfers
I have tried so far.
(cherry picked from commit aa98db576b)
2008-09-26 12:30:21 -07:00
George Peter Staplin
d1b39134cd XQuartz: pbproxy: Fix NSObject memory leaks by properly using the
NSAutoreleasePool.   Now the usage is consistent.  In x_input_run()
we create a pool, and release it after processing the XEvents.

Add some getpid() output to main for debugging.  It needs a bit more
testing before the next release.

Don't retain the NSPasteboard as the old code did.  That may have
contributed to the leak, and it made it so that we needed the
NSAutoreleasePool created in main().

Remove the _known_types, and _pasteboard instance variables from
the x_selection class.  They aren't needed anymore.

The leaks program now indicates 0 leaks after some usage.  I want
to test further, but this seems much better, and my memory usage
graph indicates it's not growing.
(cherry picked from commit b245d84a72)
2008-09-26 12:30:10 -07:00
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
Alan Hourihane
af8cef461c only build dri2 when DRI2 is enabled 2008-09-24 14:24:36 +01:00
Adam Jackson
97f688f2b4 xserver 1.5.1 2008-09-23 14:51:33 -04:00