andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,957 Commits 86 Branches 473 Tags 48 MiB
56dc121520
Commit Graph

2240 Commits

Author SHA1 Message Date
Jeremy Huddleston
98b5f373e6 XQuartz: Disable 256 color option and fullscreen option 
(cherry picked from commit 7c1964338a)
 2008-03-21 19:35:02 -07:00
Jeremy Huddleston
f06a7ae344 Xquartz: Added separate preference tab for quartz-wm settings 
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7)
 2008-03-21 19:34:57 -07:00
Jeremy Huddleston
6fc293182f XQuartz: Initial framework for dealing with spaces on OS-X 
(cherry picked from commit 9831324998)
 2008-03-21 19:34:51 -07:00
Jeremy Huddleston
f03202ad15 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman 2008-03-17 23:57:41 -07:00
Jeremy Huddleston
509827a598 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-03-01 17:10:42 -08:00
Jeremy Huddleston
f91c915903 XQuartz: Quit now properly warns the user 
(cherry picked from commit ed3d7b3959)
 2008-02-23 00:28:38 -08:00
Maarten Maathuis
dc30ade649 Fix rotation for multi-monitor situation. 
- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787.
(cherry picked from commit a48cc88ea2)
 2008-02-19 21:58:26 +02:00
Jeremy Huddleston
04a09e9271 XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it. 
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471)
 2008-02-19 00:01:52 -08:00
Jeremy Huddleston
70f9495e0c Added Xquartz.plist to EXTRA_DIST 2008-02-16 01:33:13 -08:00
Jeremy Huddleston
c3e87251b8 Fixed unescaped newline in EXTRA_DIST 
(cherry picked from commit 567c172c4d)
 2008-02-16 01:00:35 -08:00
Jeremy Huddleston
e079e40319 XQuartz: Fixed EXTRA_DIST to include localization 
(cherry picked from commit 1b338c2a93)
 2008-02-15 23:18:22 -08:00
Jeremy Huddleston
b3eabf13af XQuartz: Fixed layout of Applications->Customize menu 
Now resizing it won't produce weir overlaps of the widgets.  Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d)
 2008-02-11 12:10:55 -08:00
Jeremy Huddleston
407f7fec88 XQuartz: Added option for setting quartz-wm click-through preference 
(cherry picked from commit bf54c267cb)
 2008-02-10 18:30:34 -08:00
Jeremy Huddleston
fb52ef7c86 XQuartz: Converted interface to nib 3.x format 
(cherry picked from commit 656aaab957)
 2008-02-10 18:30:28 -08:00
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