Jeremy Huddleston
d6e234f96d
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2008-01-17 09:48:14 -08:00
Matthieu Herrb
59a3b83922
Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
2008-01-17 17:00:06 +01:00
Daniel Stone
636aa9e7be
Xephyr: One-time keyboard leak fix
...
Don't leak the originally-allocated keysym map.
(cherry picked from commit e85130c85f
)
2008-01-17 18:43:30 +11:00
Jeremy Huddleston
7429379eb1
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
2008-01-13 14:00:25 -08:00
Jeremy Huddleston
a459dde0b4
XQuartz: Fixed copy-paste error with login_shell commit
...
(cherry picked from commit 6deec3acc6
)
2008-01-12 21:34:13 -08:00
Jeremy Huddleston
7899c5bebf
XQuartz: Corrected copyright X.org Project -> X.org Foundation
...
(cherry picked from commit f216314448
)
2008-01-12 12:01:22 -08:00
Jeremy Huddleston
95a103bc60
XQuartz: added 'login_shell' option to defaults
...
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce
)
2008-01-12 12:01:10 -08:00
Jeremy Huddleston
627ed60ce5
XQuartz: Fixed switching into XQuartz via expose.
2008-01-06 18:29:54 -08:00
Jeremy Huddleston
4c5c30a4be
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
2008-01-05 03:14:07 -08:00
Jeremy Huddleston
fab82c097c
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
2008-01-04 22:51:12 -08:00
Jeremy Huddleston
4790016cc2
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42
)
2008-01-04 21:27:31 -08:00
Jeremy Huddleston
c9dff90ce8
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2008-01-03 13:26:22 -08:00
Jeremy Huddleston
8e4c28ec2a
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:48 -08:00
Daniel Stone
a304fc1d4a
KDrive: Xephyr: Don't leak screen damage structure
...
(cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5)
2007-12-28 15:51:00 +02:00
Jeremy Huddleston
61cc57c510
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:43 -08:00
Jeremy Huddleston
6562b8d4f7
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14
)
2007-12-21 02:07:03 -08:00
Jeremy Huddleston
628c9c708a
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91
)
2007-12-21 01:57:59 -08:00
Jeremy Huddleston
b585e48cff
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fed
)
2007-12-21 01:24:31 -08:00
Jeremy Huddleston
60d28ff8df
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb
)
2007-12-20 19:38:42 -08:00
Jeremy Huddleston
9f5507a3c5
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2007-12-20 19:04:33 -08:00
Jeremy Huddleston
82c97a5475
XQuartz: Cleaned up command line arguments.
...
(cherry picked from commit 603a8b73d4
)
2007-12-20 18:30:09 -08:00
Jeremy Huddleston
2a3f6ce7e8
XQuartz: Kill off server-main.c and launcher-main.c
...
Now using xinit
(cherry picked from commit 5d6ae3d299
)
2007-12-20 18:09:19 -08:00
Jeremy Huddleston
ea716249c3
XQuartz: Don't fork to exec app_to_run.
...
Plus other housecleaning...
(cherry picked from commit ae302db472
)
2007-12-20 17:35:51 -08:00
Jeremy Huddleston
47a5869ba3
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543
)
2007-12-20 15:46:54 -08:00
Jeremy Huddleston
be027ea7ea
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:17:56 -08:00
Ben Byer
88f289dd1c
adding AM_OBJCFLAGS
2007-12-16 04:20:24 -08:00
Jeremy Huddleston
39b20011b7
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9d
)
2007-12-16 01:14:47 -08:00
Ben Byer
16c032a602
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:26 -08:00
Ben Byer
4346e6b5dd
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7
)
2007-12-14 15:22:21 -08:00
Ben Byer
077d54c689
fixed bug in x11-exec that prevent icon from showing up
...
(cherry picked from commit e1f4a0c20d
)
2007-12-14 15:22:16 -08:00
Jeremy Huddleston
fcb97a55a0
Xquartz: Fixed cpprules include
...
(cherry picked from commit 95c02adea8
)
2007-12-14 15:21:49 -08:00
Jeremy Huddleston
32e74d744c
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80
)
2007-12-13 16:28:20 -08:00
Jeremy Huddleston
8eb15256ec
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fe
)
2007-12-13 16:27:46 -08:00
Ben Byer
fa3ccf4c2a
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e
)
2007-12-13 16:26:09 -08:00
Ben Byer
eb141e05f3
created x11-exec wrapper, which uses LaunchServices to find
...
(and then exec) X11.app
(cherry picked from commit fc04c9759b
)
2007-12-13 16:26:04 -08:00
Arkadiusz Miskiewicz
d988da6eee
Xprint: Clean up generated files
...
Remember to clean generated wrapper files.
(cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3)
2007-12-13 00:09:15 +02:00
Hong Liu
41f735fbe0
bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
...
This patch should fix bug 8080.
(cherry picked from commit 9adea80703
)
2007-12-13 00:00:27 +02:00
Hong Liu
f4bcb53e86
Bug 13308: Verify and reject obviously broken modes.
...
(cherry picked from commit c6cfcd408d
)
2007-12-12 23:59:54 +02:00
Jeremy Huddleston
ffa66f8e74
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41
)
2007-12-10 21:02:44 -08:00
Jeremy Huddleston
ea713786b3
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dc
)
2007-12-10 21:02:38 -08:00
Jeremy Huddleston
80089a20ed
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca
)
2007-12-10 20:34:25 -08:00
Ben Byer
83c0f69aa1
remove Xplugin.h, because we should use the one in /usr/include
...
(cherry picked from commit 3e881032f3
)
2007-12-09 12:03:35 -08:00
Jeremy Huddleston
14ec1cf1cb
Xquartz: Added missing link to libconfig.a
2007-12-09 12:02:04 -08:00
Jeremy Huddleston
8a056b8e09
Xquartz Added quartzKeyboard.h to EXTRA_DIST
...
(cherry picked from commit 37c9781fdb
)
2007-12-08 11:49:51 -08:00
Ben Byer
3ea32bac43
Added darwinEvents.h to EXTRA_DIST
...
(cherry picked from commit 45e5247564
)
2007-12-08 11:33:50 -08:00
Jeremy Huddleston
b72e8fa499
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:41:58 -08:00
Jeremy Huddleston
2c7c378619
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
...
(cherry picked from commit c5ccb98d5d
)
2007-12-08 01:28:45 -08:00
Jeremy Huddleston
3357ef0f40
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:10 -08:00
Jeremy Huddleston
743b266c17
XQuartz: Fixed "Multiple Dock Icons"
...
BAM!
(cherry picked from commit d0dca8a885
)
(cherry picked from commit 0502955a2a
)
2007-12-08 00:34:31 -08:00
Jeremy Huddleston
5676ba6fc0
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-08 00:32:13 -08:00
Jeremy Huddleston
aed01c4a8b
Darwin: Use __APPLE__ instead of __DARWIN__
...
(cherry picked from commit 54654815fa
)
2007-12-07 18:53:31 -08:00
Jeremy Huddleston
4ae5621664
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2007-12-07 14:14:32 -08:00
Jeremy Huddleston
06c46ec050
Darwin: Dead coded removal
...
Kill off assert macro
(cherry picked from commit d6493abedb
)
2007-12-07 14:08:09 -08:00
Jeremy Huddleston
898b03775e
Darwin: Renamed DarwinModeBlah to QuartzBlah
...
(cherry picked from commit 08ebf86d37
)
2007-12-05 21:25:51 -08:00
Jeremy Huddleston
15add97723
Darwin: Be more precise in version information shown.
2007-12-05 20:29:23 -08:00
Jeremy Huddleston
df5c9fef3c
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:26:16 -08:00
Jeremy Huddleston
2c68f4aa3a
Darwin: Cleaned up keyboard interface headers
...
(cherry picked from commit 141f69dc3d
)
2007-12-05 20:20:31 -08:00
Daniel Stone
9f4689173e
KDrive: Xephyr: Fix non-GLX builds
...
Only set noGlxExtension if we're actually building GLX.
2007-12-06 00:46:32 +00:00
Daniel Stone
d37351308b
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.
(cherry picked from commit 320abd7d1d
)
2007-12-06 00:30:02 +00:00
Jeremy Huddleston
3f60656eb3
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
...
(cherry picked from commit e8399fd4d6
)
2007-12-04 18:00:00 -08:00
Jeremy Huddleston
345e21a4b1
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:50 -08:00
Jeremy Huddleston
e7026216cc
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 0284b3631a
)
(cherry picked from commit b0349d5b6c
)
(cherry picked from commit c3c71a882f
)
2007-12-03 20:20:05 -08:00
Ben Byer
39d3a87c6c
added missing call to xcb_connect()
...
(cherry picked from commit dc2fb323ee
)
2007-12-01 19:03:59 -08:00
Jeremy Huddleston
ed66724b3a
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:30 -08:00
Ben Byer
bf1f49c530
properly implemented xcb check for stale sockets
...
(cherry picked from commit f543cb8fbb
)
2007-11-30 16:12:29 -08:00
Jeremy Huddleston
be05ef82d5
Darwin: Undo focus-hack which didn't work right.
...
(cherry picked from commit f54b28eeba
)
2007-11-30 16:12:09 -08:00
Jeremy Huddleston
d2b768890f
Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.
2007-11-29 02:19:22 -08:00
Jeremy Huddleston
3d153c8fa4
Darwin: Removed support for darwinSwapAltMeta
2007-11-28 23:07:41 -08:00
Jeremy Huddleston
aa1fedbd69
Darwin: Added missing function prototypes.
2007-11-26 14:54:51 -08:00
Jeremy Huddleston
b8ccca70ff
Darwin: Workaround weird crash in keyboard events
...
Somehow including dix-config.h in darwin.h is crashing us... just defining
SHAPE as a workaround for now.
2007-11-26 14:29:07 -08:00
Jeremy Huddleston
e4933212e1
Darwin: Switched to expirimental darwinEvents.c from master
2007-11-26 13:05:48 -08:00
Jeremy Huddleston
9c6d8a035b
Darwin,Rootless: Makefile cleanup
2007-11-26 13:04:57 -08:00
Jeremy Huddleston
78b053b859
Darwin: Formatting cleanup
2007-11-24 03:34:48 -08:00
Jeremy Huddleston
28ae09f355
Darwin: Sync-up to master and xorg-server-1.2-apple where appropriate
2007-11-23 14:18:04 -08:00
Jeremy Huddleston
738a229a71
Various cleanups to get Xquartz to compile.
2007-11-20 06:59:11 -08:00
Jeremy Huddleston
7f91d756ac
Darwin: Formatting Cleanup
...
To better line up with xorg-server-1.2-apple branch
2007-11-20 04:49:34 -08:00
Jeremy Huddleston
8c533443f8
Darwin: Sync up darwinEvents.c to match what is in use in xorg-server-apple-1.2
2007-11-20 04:10:45 -08:00
Jeremy Huddleston
837fd3bb99
Darwin: Fixed make dist
...
Added/corrected missing EXTRA_DIST entries.
2007-11-20 04:07:44 -08:00
Jeremy Huddleston
0bd2b610c4
XDarwin dead code removal
...
Removed unused code from the tree
Moved some files to more appropriate locations
2007-11-20 04:07:42 -08:00
Ben Byer
260ea61540
Added some DEBUG_LOG sauce to the XP_EVENT handling code
2007-11-20 04:07:39 -08:00
Ben Byer
1ffd8ba7a2
Disabled ALT_IS_MODE_SWITCH
...
(just for joke, nothing more)
2007-11-20 04:07:37 -08:00
Jeremy Huddleston
db6404f9d0
Added --with-x11app-archs configure option
...
This configure option's value is passed to xcodebuild in ARCHS, so we can easily choose architecture targets for X11.app
2007-11-20 04:07:34 -08:00
Ben Byer
e220328bdf
From Jeremy: In my previous patch, I "overfixed" hook.c. This patch
...
removes the changes I made to the searching for loop since those are
extraneous due to the remove function call in the delete for loop.
2007-11-20 04:07:32 -08:00
Ben Byer
c50a40263b
More correctness fixes to fix compiler warnings.
2007-11-20 04:07:29 -08:00
Ben Byer
cee516e142
From Jeremy Huddleston:
...
1) Fixed a bug where XQUARTZ was #defined when auto but not when --enable-xquartz
2) Cleaned up missing #includes and function prototypes.
3) Fixed some invalid C syntax problems
4) Removed a bunch of dead code
5) Cleaned up code to prevent some warnings
6) Bugfix in xpr/x-hook.c - looks like someone just forgot to finish writing code for hook_remove()... I only noticed it because gcc -Wall complained about reaching the end of a non-void function... lucky for us gcc is smarter than we are.
2007-11-20 04:07:22 -08:00
Ben Byer
41eabe5d4c
added a bunch of debugging code to help troubleshoot the stuck
...
modifier key issue; much of it may be taken out later.
Also, hopefully fixed a race condition that may have
prevented ReleaseModifiers from working in some cases.
2007-11-20 04:05:37 -08:00
Ben Byer
6577916c44
a first stab at DEBUG_LOG
2007-11-20 04:04:53 -08:00
Ben Byer
7696bcddd0
Added a lightweight debugging facility to support troubleshooting
...
(for example) the stuck modifier key issue
2007-11-20 04:02:28 -08:00
Ben Byer
cad8133cce
More XDarwin cleanup / dead code removal from Jeremy
2007-11-20 04:02:15 -08:00
Ben Byer
da6cfcb89b
Build system patches to remove XDarwin from the build (since it doesn't
...
work anyway), courtesy of Jeremy Huddleston
2007-11-20 04:00:00 -08:00
Ben Byer
96416bd595
fix missing -DXFree86Server; this needs to be defined when building
...
fb/fbcmap.c or else you get the "sunglasses effect"
2007-11-20 03:58:59 -08:00
Ben Byer
cfa99fa687
null pointer check
2007-11-20 03:54:49 -08:00
Ben Byer
10ecb31cd1
More build system fixes from Jeremy
2007-11-20 03:54:47 -08:00
Ben Byer
1c8e5994c6
converted some debugging prints to TRACE() statements
2007-11-20 03:54:44 -08:00
Ben Byer
22bf25c1b4
Fix for stuck modifier keys, attempt 2!
2007-11-20 03:54:29 -08:00
Ben Byer
1bad9b87e5
And now we kill XDarwinApp -- credit, Jeremy Huddleston
2007-11-20 03:48:24 -08:00
Ben Byer
49b2fb0965
Patch to fix various issues with the launcher, courtesy of Jeremy Huddleston
2007-11-20 03:43:12 -08:00
Ben Byer
ec0d30011c
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
2007-11-20 03:43:03 -08:00
Ben Byer
10a5178258
Fix {/usr/X11,/Applications/Utilities}/X11.app install targets to properly respect
...
$DESTDIR. Credit to Jeremy Huddleston
2007-11-20 03:41:32 -08:00
Ben Byer
c213749b19
fixes to allow Xvfb and Xephyr to be built if you build with --disable-xdarwin
2007-11-20 03:41:29 -08:00
Ben Byer
906c3195c9
fix for spurious "Are you sure you want to quit?" message
2007-11-20 03:41:27 -08:00
Ben Byer
d54bb8fafa
Adding "fake RandR" support from old X11.app
2007-11-20 03:41:24 -08:00
Ben Byer
7768c63675
formatting fixes
2007-11-20 03:41:19 -08:00
Ben Byer
6efdc6ca7b
Fix for off-by-one error in menu bar height calculation -- props to Nicholas Riley!
2007-11-20 03:41:17 -08:00
Ben Byer
5d0c594e1d
Undo some last-minute breakage in xpr.h
2007-11-20 03:41:14 -08:00
Ben Byer
cd7ab53241
removed debugging output
2007-11-20 03:41:12 -08:00
Ben Byer
c536ddf6ae
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-20 03:41:09 -08:00
Ben Byer
36fca3bc35
formatting changes.
2007-11-20 03:41:07 -08:00
Ben Byer
9a0ee8b746
Fixed Spaces issue, correctly -- dragging an X window from one
...
Space to another in Expose mode now works.
2007-11-20 03:41:04 -08:00
Ben Byer
d24c85e507
formatting cleanup
2007-11-20 03:39:00 -08:00
Ben Byer
e8af07211f
Fixed logic error that prevent JIS (Japanese) keyboard layouts from
...
being detected.
2007-11-20 03:38:57 -08:00
Ben Byer
83ef367458
Disable deferred updates in xp_init to fix performance problems
...
-- thanks to Eric Gouriou for pointing out the issue
2007-11-20 03:38:50 -08:00
Ben Byer
907129f62b
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-20 03:36:16 -08:00
Ben Byer
0ed01da098
Fix for focus issue:
...
<rdar://problem/5289578> X11 menu bar uncoupled from X11 application's windows
Credit to William Mortensen for submitting the first community patch!
2007-11-20 03:30:44 -08:00
Ben Byer
23cdc7027a
Swap modifier keys for buttons 2 and 3 -- now Option-click is the middle click
2007-11-20 03:30:41 -08:00
Ben Byer
c42059a8ad
default for is_uchr should be 1, not 0
2007-11-20 03:30:39 -08:00
Ben Byer
94c71a1405
fixed an uninitialized variable, which caused keyboard breakage on x86
...
when building with optimization enabled.
2007-11-20 03:30:36 -08:00
Ben Byer
ed15fe4f52
fixed bug that prevented customized Applications menu items
...
with arguments from working
2007-11-20 03:30:31 -08:00
Ben Byer
a1c8b66164
fix incorrectly formatted .xinitrc warning
2007-11-20 03:30:29 -08:00
Ben Byer
005b7d637a
Trap Deactivate messages and release modifiers to avoid "stuck shift lock" (etc) bugs
2007-11-20 03:30:26 -08:00
Ben Byer
579a051457
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.)
2007-11-20 03:26:54 -08:00
Ben Byer
65c67205fd
Enable PseudoramiX extension by default, like on the old server
2007-11-20 03:18:21 -08:00
Ben Byer
37679cadf8
make dist fixes
2007-11-20 03:17:45 -08:00
Ben Byer
cfdf2fa281
Added patch fix yellow-cursor problem which appears on some Intel Macs
2007-11-20 03:17:00 -08:00
Ben Byer
616ba3c7d6
finished committing downstream changes
2007-11-20 03:15:02 -08:00
Ben Byer
b8e6c80c0d
more patches, autoconf fixes...
2007-11-20 03:13:06 -08:00
Ben Byer
120e831640
More patches from downstream
2007-11-20 03:01:12 -08:00
Ben Byer
2c4d1eeb41
removed CVS Id tags
2007-11-20 02:25:59 -08:00
Ben Byer
a1d901d686
merged the rest of Apple patches to xserver
2007-11-20 02:24:54 -08:00
Ben Byer
e3f9867e86
added missing file from Apple version of 7.2
2007-11-20 02:21:14 -08:00
Daniel Stone
b3de1b9d37
XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
...
When we're building with --enable-debug, don't emit an ErrorF every time a
function gets called.
(cherry picked from commit 6d59bb5709
)
2007-11-17 22:06:49 +01:00
Dodji Seketeli
007e2239cf
Xephyr: don't initialise the GLX extension
2007-11-12 20:29:12 +01:00
Matthias Hopf
f350c81a91
Prefer configured DisplaySize to probed DDC data, if available.
...
Based on patch by Hong Liu <hong.liu@intel.com>.
(cherry picked from commit 48ca5961ca
)
2007-11-06 14:53:42 +00:00
Keith Packard
c550186570
Screen size changing should leave FB alone when X is inactive.
...
xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with
suitable vtSema checks to avoid invoking driver code while the X server is
inactive.
(cherry picked from commit 265a633cf1
)
2007-11-06 14:53:03 +00:00
Mark Vytlacil
ab80b27250
XFree86: Input: Save/restore errno around SIGIO (bug #10683 )
...
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
(cherry picked from commit 41c3069f7c
)
2007-11-04 16:46:34 +00:00
Peter Hutterer
84040b655e
xfree86: wrap keyboard devices for XKB.
...
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
(cherry picked from commit d627061b48
)
(cherry picked from commit 8ead41388e
)
2007-10-30 00:59:17 +02:00
Daniel Stone
b76b1d51fe
XFree86: Remove ridiculous SIGIO debugging
...
YOU PRESSED A KEY
AND AGAIN
YOU RELEASED A KEY
AND AGAIN
YOU PRESSED A KEY
AND AGAIN
... not so much.
(cherry picked from commit 493b83bd09
)
2007-10-30 00:58:19 +02:00
Daniel Stone
bd779f8cde
configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
...
Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
explicitly disabled in configure, or we don't have the proto modules
installed.
(cherry picked from commit df57ae1639
)
2007-10-30 00:57:49 +02:00
Daniel Stone
f73fd98a86
Fix key repeats during VT switch.
...
Add keyc->postdown, which represents the key state as of the last mieqEnqueue
call, and use it when we need to know the posted state, instead of the
processed state (keyc->down). Add small functions to getevents.c to query and
modify key state in postdown and use them all through, eliminating previously
broken uses.
(cherry picked from commit 81c28ffd2b
)
2007-09-05 17:47:50 -07:00
Keith Packard
3c5fe1ec37
Deliver correct event when releasing keys on VT switch.
...
In commit 41bb9fce47
, the event delivery loop
for Xinput enabled keyboards was changed and accidentally used the wrong
index variable, causing random events to be delivered when returning from VT
switch.
In addition, in commit aeba855b07
,
SIGIO was blocked during delivery of these events, but not for the entire
period the xf86Events array was being used. Block SIGIO for the whole loop
to avoid other event delivery from trashing the key release events.
(cherry picked from commit aa7ed1f5f3
)
(cherry picked from commit accd71bda6
)
2007-09-05 14:59:16 -07:00
Eric Anholt
70ed110538
Fix server version reporting to be the server package version.
...
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense. Instead, just
report the package version.
When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch). The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).
This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now. While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.
(cherry picked from commit 47300ed2be
)
2007-09-05 13:31:50 -07:00
Alan Hourihane
b328d55372
Allow yres_virtual to be greater for some kernel fbdev drivers.
...
(temporary fix for older fbdev drivers)
(cherry picked from commit 87495fc706
)
2007-09-04 17:44:17 -07:00
Eric Anholt
5efc4bd7d0
Remove backend.[ch] from neomagic to fix distcheck.
...
(cherry picked from commit 917e3bb83a48da7618fce463cf6283be36cd9084)
2007-08-31 18:28:34 -07:00
Egbert Eich
bcd6708895
Fixing a misleading comment which could suggest a GPL violation.
...
The author of the int10 code looked at the VBIOS POSTing code
in DOSEMU to get some initial idea on how to POST a VBIOS.
To give credit to the DOSEMU Team for this inspiration a comment
was added to the code which could suggest that code from the
GPLed DOSEMU was directly incorporated into this code.
This patch should clearify the situation.
(cherry picked from commit 1d11e4bc4c
)
2007-08-30 11:20:40 -07:00
Eric Anholt
ed001ed363
Bug #9629 : Remove badly-licensed neomagic kdrive files.
...
Licensing issues of these files include:
- They claim to be licensed under the GPL, yet we haven't allowed that in the
xserver repository in the past.
- They refer the user to the top of the tree for GPL license text, yet it isn't
there.
- They claim to be derived from the (MIT-licensed) ati kdrive code, yet don't
follow the licensing terms of those files.
(cherry picked from commit 87295b66a9
)
2007-08-29 16:48:59 -07:00
Alex Deucher
5182fbf302
Add _X_EXPORT to exported functions in hw/xfree86/modes/*
...
Also add missing exports to hw/xfree86/loader/xf86sym.c
(cherry picked from commit 81f8b652d9
)
2007-08-29 16:48:52 -07:00
Dave Airlie
d34b66402c
randr: fixup crtc and output destroy
...
if you are moving pointers, you want to move the pointers not just a byte
(cherry picked from commit 76bf3cd7b8
)
2007-08-23 12:22:56 -07:00
Keith Packard
efac9c9c2e
Ref count cursors used in hw/xfree86/modes code.
...
The multi-crtc cursor code in hw/xfree86/modes holds a reference to the
current cursor. This reference must be correctly ref counted so the cursor
is not freed out from underneath this code.
(cherry picked from commit 7dc8531548
)
2007-08-23 12:22:35 -07:00
Alex Deucher
248b220b3e
add xf86_crtc_clip_video_helper to xf86sym.c
...
(cherry picked from commit 1f6ddae003
)
2007-08-23 12:22:17 -07:00
Alex Deucher
242c05e326
move intel crtc xv clipping helper to the xserver
...
The code is generic and can be used by any overlay-based card when
adding randr 1.2 support. Tested on radeon.
(cherry picked from commit 53c04351c4
)
2007-08-23 12:22:14 -07:00