summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2009-02-17glx: Replace broken GLX visual setup with a fixed "all" mode.Eric Anholt1-15/+0
With trying to match depths so that you didn't end up with a depth 24 fbconfig for the 32-bit composite visual, I broke the alpha bits on the depth 24 X visual, which angered other applications. But in fixing that, the pickFBconfigs code for "minimal" also could end up breaking GLX visuals if the same FBconfig was chosen for more than one X visual. We have no reason to not expose as many visuals as possible, but the old "all" mode didn't match any existing X visuals to GLX visuals, so normal GL apps didn't work at all. Instead, replace it with a simple combination of the two modes: Create GLX visuals by picking unique FBconfigs with as many features as possible for each X visual in order. Then, for all remaining FBconfigs that are appropriate for display, add a corresponding X and GLX visual. This gets all applications (even ones that aren't smart enough to do FBconfigs) get all the options to get the visual configuration they want. The only potential downside is that the composite ARGB visual is unique and gets a nearly full-featured GLX visual (except that the root visual might have taken the tastiest FBconfig), which means that a dumb compositing manager could waste resources. Write compositing managers using FBconfigs instead, please. (cherry picked from commit c40bad88475debf7a1774e22dce835577ad32154) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17Merge branch 'panning-for-server-1.6' into server-1.6-branchKeith Packard3-5/+85
2009-02-17Correct static symbol XkmReadTOC and first pass on compile warning fixes.Paulo Cesar Pereira de Andrade3-13/+18
The warnings corrected were only the ones that should correct real problems. The most common one is 64 bit integers as "printf %l" arguments. Note that there is a patch related to this at: http://bugs.freedesktop.org/show_bug.cgi?id=18204 Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 16b11cd03d8c5def07f0e598f237f71a37883a46)
2009-02-17xfree86: always force RAW mode under linux.Peter Hutterer1-35/+25
The previous check for AEI on left us with the possibility that AEI is forced off in the config, but devices are added through evdev nonetheless. A keyboard added this way can CTRL+C the server. Even when we use kbd, we can set the mode to RAW, so it's safer alround to to so. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b33905234025f005819c7e2acd653a3a0ecfeb82) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17Check for and report errors writing xorg.conf.new from Xorg -configureAlan Coopersmith1-2/+10
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit ac470dfb4fadaa0b28b6f8b57f4f13a20842b897) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17Correct error message if specified config file is not foundAlan Coopersmith1-3/+2
By making the "Unable to open config file" header a warning, it was not appearing with the filename when a config file was specified and not found. Now we make it an error message again, but only issue the error if a filename was specified - if none was specified, then we don't even issue a warning, just the "Using autoconfig" info message. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit bd713794ceaa1b2890522554562103c0a2d50f04) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17Handle the combination of panning and crtc transformsKeith Packard1-26/+10
This patch gets the shadow scanout buffer repainted on panning area changes. It does not, however, track the mouse correctly. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 7968823cbc02615e1080c0d3f34dcebe14ea1771) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17Damage re-used shadow scanout buffer using new transforms.Keith Packard1-1/+5
When the shadow scanout buffer can be re-used, the underlying framebuffer area must be damaged so that the scanout will be repainted. This patch delays the addition of that damaged area until after the transform in the crtc has been updated, otherwise the old transform would have been used and the wrong area repainted. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 763df9eec79a867978efc5138d8635a46c1a0d17) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-01-30avoid a potential endless loop.Xiang, Haihao1-2/+6
Previously it is possible that creating rotation data, then cleaning up and creating again so that pScreen->BlockHandler and xf86_config->BlockHandler all point to xf86RotateBlockHandler. See bug #19343. (cherry picked from commit 5f3188228eb988bd8f08b62c84f98a8ff66ee283)
2009-01-30XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.George Staplin1-0/+19
(cherry picked from commit 143224405ba74929c702a95de52b56df140b0d1b)
2009-01-30XQuartz: SnowLeopard: Help system book name changed in 10.6Jeremy Huddleston1-8/+9
(cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
2009-01-30XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where ↵Jeremy Huddleston3-10/+15
appropriate on fat binary compilation (cherry picked from commit f020900641b44a1142e5c2198e9678de2744454e)
2009-01-30XQuartz: xpr: Cleanup some of the code and possibly fix part of the GLX ↵George Staplin1-80/+127
Pixmap problem. Split DRICreateSurface into 3 functions. Make CreateSurfaceForPixmap use xp_configure_surface. I suspect this is partly why GLXPixmaps never worked. It will require some more work and thoughts for pbuffers, unless we fake those with pixmaps and surfaces. (cherry picked from commit 9cf264e67744262b9f45079e6cd752eb3e3b0e08)
2009-01-30XQuartz: Only call DarwinUpdateModKeys when neededJeremy Huddleston3-4/+15
Previously, we were calling it on almost every itteration through sendX11Event (cherry picked from commit 6461729647ff4441d80811e73f0c0d2f108f2700)
2009-01-30XQuartz: GL: Make indirect.c build and work in the 1.6 branch.George Staplin1-588/+84
Reorder some header files and provide some types earlier on. Remove the static __GLXextensionInfo __glDDXExtensionInfo; that isn't used in 1.4 or 1.5, and seems to have been removed from 1.6. Remove the data structures associated with that too. Remove __glXAquaDrawableResize. The GLX structure doesn't use it anymore, and the Apple version did nothing useful before. __glXAquaDrawableSwapBuffers(): base no longer contains a drawGlxc member. Now provide the the Apple/Aqua context in the __GLXAquaDrawable struct. Add the context member to the __GLXAquaDrawable struct. Remove the fallback configs. They aren't used in 1.4 or 1.5 either. Remove init_visuals(). It's not used in 1.4 or 1.5 either. In the drawable constructor initialize the state properly, including the new context member. Remove glAquaResetExtension() -- it's not used anymore. This has been tested remotely and proven to work with glxgears, fire, various texture programs I wrote, and various Mesa demos. (cherry picked from commit d514152195452ae11ec7769c76489651620ad380)
2009-01-30XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT.George Staplin1-1/+1
(cherry picked from commit 3c14546f58f8a138fe67c9cacc3bd0b7fa90c29a) (cherry picked from commit a665ed16f736cf1901b89448dc5d37f4d16dfaf4)
2009-01-30XQuartz: GL: Make many more fbconfigs and visuals available for the 1.5 branch.George Staplin1-261/+190
Use a __GLXconfig linked list struct to store the configurations for the fbconfigs and visuals in a pGlxScreen. Also, remove the __GLXvisualConfig/GlxSetVisualConfigs code that isn't used anymore. There is more code we can remove later, but I want to do that in separate commits. (cherry picked from commit 94162b0f8a25267aca280d25e216cc6bde47da6e) (cherry picked from commit 15bb6abd59fdefe7037237faaea1a39711a972ed)
2009-01-12Fix dmx compile on 1.6 branch.Alban Browaeys7-0/+42
http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg166742.html contains a patch from "arekm" which I build upon to make up this one. Mostly fixes for Xcalloc which I previously tried to fix the same way but without finding the right spot. I cannot tell if dmx works though. Only that it at least compile. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-01-12XQuartz: Add locking to make mieq thread safe on OSXJeremy Huddleston1-1/+2
(cherry picked from commit 7a8d2266861e74176b5310b83652a9c10a170494)
2009-01-12XQuartz: misc 1.6 updates (still --disable-glx)Jeremy Huddleston5-26/+19
rlAccel is not longer compatable, and it's not worth fixing Don't override DeviceCursorInitialize with a noop Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place) (cherry picked from commit c137f681680e1d04b1513a8be68aeda4d1c56fd5)
2009-01-12XQuartz: Use depth=24 instead of FatalError if we can't figure out our depthJeremy Huddleston1-15/+15
(cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3) (cherry picked from commit 932ed6e949757926a17f7efe6b0255e38efa1152)
2009-01-12XQuartz: Make debugging output for invalid depths a bit more detailedJeremy Huddleston1-2/+2
(cherry picked from commit 609fb166b7062c76f0561df12ffe893811f6ac8f) (cherry picked from commit 1962af7ee3bdf54cfa674187dea67b9ad36cd5a1)
2009-01-11xfree86: Only use the evdev ruleset on linux.Peter Hutterer1-2/+8
As suggested by Julien Cristau This is an follow-up to commit 9c5dd7337fa93fb1650cc017e523b939dcbf482a Author: Peter Hutterer <peter.hutterer@redhat.com> Date: Wed Dec 3 14:24:25 2008 +1000 Let the DDX decide on the XkbRulesDefaults. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Acked-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit 13de7511b17b57a28668e1a60b196ccfe61dbcbe) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-01-11Let the DDX decide on the XkbRulesDefaults.Peter Hutterer1-0/+6
Rather than assuming rules in the CoreKeyboardProc, init the default rules in InitCoreDevices, then re-use them later. In the xfree86 DDX, set the rules to "base" or "evdev", depending on whether we'll load kbd or evdev. If we create a new MD, use pc105,us as default and re-use the rules file used previously. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-01-09xfree86: don't restore the TTY mode if we didn't initialize it ourselvesPeter Hutterer1-2/+4
Restoring it unconditionally means we restore to whatever tty_mode has as default value (i.e. 0). K_RAW happens to be 0x00, so we always restore to raw mode if allowEmptyInput is off. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit aea6f19f25e13768b1d09fac4991d6a5e6c2cdac)
2009-01-09xfree86: If an input device failed to activate, return immediately.Peter Hutterer1-1/+4
Devices are only activated once - right after they've been added to the server. If a device failes activation, it's dead. There's no reason to continue. Return the error code from ActivateDevice() without setting up sprite information or even sending a event to the client. Then - in the DDX - just remove the device again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 27011254c4de4e573a0851bf46892fb488db6522)
2009-01-09xfree86: don't call CheckMotion if a device hasn't been enabled. #19176Peter Hutterer1-3/+4
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176> (cherry picked from commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a)
2009-01-09XQuartz: Use AvailabilityMacros.h instead of availability.h for TigerJeremy Huddleston2-2/+2
(cherry picked from commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d) (cherry picked from commit 65ab2f44ea7fc4d87e021bed548eda81fc3cbae7)
2009-01-09XQuartz: Copyright Update... happy new yearJeremy Huddleston1-2/+2
(cherry picked from commit 9f1c26ae8d9ccf81cba0ab946326968a701f8c36) (cherry picked from commit df6ca888b0c04fdf4ff2d7fb4a414275b983ed34)
2009-01-09XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy ↵Jeremy Huddleston3-24/+27
thread to avoid possible deadlock (cherry picked from commit 49e59d32b88e4fad070f230b5efaa261b47f78db) (cherry picked from commit adbfd49da2453b58a9e13b09c62e0611ea1c3f77)
2009-01-09XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASKJeremy Huddleston2-10/+8
We don't have keycodes for them, so don't try to use them (cherry picked from commit cb912aca3a2834c4ad8e386c8a0d05c1bb31b0e7) (cherry picked from commit 0676a580fcc05d54049269028a34358935a4101c)
2009-01-09XQuartz: Make sure to reset the saved key state when deactivating X11.appJeremy Huddleston1-1/+3
(cherry picked from commit 3eef78eb321f4f7dbca5a10c80666c621e28a1e0) (cherry picked from commit 0d2621b6d4684ec62e67156a5a9dbdd3297f9cb0)
2009-01-09XQuartz: Honor system key repeat rateJeremy Huddleston1-4/+24
(cherry picked from commit 4303c9be39a86f5a21de108f72b90a989435905e) (cherry picked from commit 9faf3de7e5610af340b92acb1b86bf03b6f2241a)
2009-01-09XQuartz: Better avoid stuck keys on context switchesJeremy Huddleston1-17/+33
(cherry picked from commit e9963f1a4f4f12f253eae9d4f01694b6cabe35ad) (cherry picked from commit 4be8d7346b9fdc014b72dd6c404ceecc0ef0d245)
2009-01-09XQuartz: Workaround OSX VNC server bug for modifier key stateJeremy Huddleston1-2/+35
A better approach which ensures we have a L modifier key down if we are told neither are down and atleast one is down... =/ (cherry picked from commit bc13dda345f716bf4de9bfe4e1d85969263b60c2) (cherry picked from commit c67a3e2972c75c02f1aeed94bc0a3c5272422267)
2009-01-09XQuartz: Updated man page fullscreen_hotkeys fullscreen_menuJeremy Huddleston1-0/+6
(cherry picked from commit 00f3a2e33c8e91da5f855821313a04ea97445656) (cherry picked from commit d790c9dd041a2c8e3513d14a556333219d0f8d5e)
2009-01-09XQuartz: Try harder to get the user's login environmentJeremy Huddleston1-4/+11
(cherry picked from commit 6bedaddd78aa04bd303df434a4c49bb87bd7deaa) (cherry picked from commit 338f096861136fb6c4f604e93ff21277252676b7)
2009-01-09XQuartz: Reposition windows when we enter fullscreen to ensure our root windowJeremy Huddleston1-4/+8
(cherry picked from commit 7617d3659b5481ef85aecc1f936e7dd2662bdfbd) (cherry picked from commit 61ae56f97326c57dda05632ca9f4873238ee18e1)
2009-01-09XQuartz: Re-enable rlAccelJeremy Huddleston2-3/+2
It was incorrectly blamed for some crashes a few months ago, and it should be safe to use until we get an EXA driver to replace it. (cherry picked from commit 8121f30bd29591fc74fbc680fbbf20210271fa58) (cherry picked from commit 85347902d97f2d4937f63ae1fac62ee46a61c82f)
2009-01-09XQuartz: Don't use keycode 0 to determine !swallow since our most common key ↵Jeremy Huddleston1-9/+13
to swallow is actual keycode 0 (a) (cherry picked from commit 33f43a7f03023bfbab25a957cb81fc25b4afa4ca) (cherry picked from commit 84f0c03418bf74188596635dcac128fc05f204ad)
2009-01-09XQuartz: Update our "screens" when we toggle rootless rather than when we ↵Jeremy Huddleston1-9/+4
toggle fullscreen This old behavior was used as a workaround for the menubar behavior in the older server, but we handle it better now and need to update our screens when we toggle the rootless state instead. (cherry picked from commit 508aa95bc2cd3fdc3dff448ec090919bf807d153) (cherry picked from commit 7e7758e1780326ad867be74dbd583a154bad017b)
2009-01-09XQuartz: Run applications via '/bin/sh -c ...' to support users who expect ↵Jeremy Huddleston2-51/+11
shell parsing (cherry picked from commit 67455e716e3ecffd528930479192785958d37988) (cherry picked from commit 7dc0dafef1d241d396f215c506ec2d4f7d8e3a24)
2009-01-09XQuartz: pbproxy: Release display notification lock when not needed to avoid ↵Jeremy Huddleston2-55/+54
deadlock (cherry picked from commit 22f664ab95a0cae981e9cefad6f075d051583ca5) (cherry picked from commit 4c256c0e9c4fe61990343c8bcf2e352c83d76e69)
2009-01-09XQuartz: update quoting in case X11.app is moved to a directory with a space.Jeremy Huddleston1-2/+2
(cherry picked from commit cc805dc799efa37c8dcefa3db04d87e9b835ffbd) (cherry picked from commit ecc3a7b6090552c309fe8e264d527ddd666a5761)
2009-01-09XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of ↵Jeremy Huddleston1-1/+6
alternate shells (cherry picked from commit b62ed1f8eaf041a946bb591165bb18ee481dedbf) (cherry picked from commit c3812aec973b7341a600e5d2d07d5a7f15abd609)
2009-01-09XQuartz: Name the startup shell script X11 for better compatabilityJeremy Huddleston4-11/+11
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf) (cherry picked from commit 102abeda37d6b62971a9952efa0453e38504ae0b)
2009-01-09randr/xfree86: Fix a one off error in the panning calculations.Maarten Maathuis1-4/+4
- Example: mode 1280x1024, panned area 1281x1024 panned_area.x2 = 1281 mode.width = 1280 If you substract 1280 from 1281, then that leaves you with one. Which is the one pixel that you need to move to actually see the last pixel collumn. Substracting 1 from this will consistently prevent you from seeing the right and bottom edge. (cherry picked from commit aedd2f566df585db7a1614f302cc8d3feda54275)
2009-01-09XAA: Disable offscreen pixmaps by default.Adam Jackson1-3/+6
Say Option "XaaOffscreenPixmaps" to turn them back on. Apropos of bugs #13795 and #15098. But this still isn't correct. (cherry picked from commit 0c6987df3b9b3a37d201d740d8248c326449835e)
2008-12-16Support -sharevts on FreeBSDRobert Noland1-36/+52
Bugzilla #11179 Submitted-by: Nathan Whitehorn Signed-off-by: Robert Noland <rnoland@2hip.net> (cherry picked from commit 7aa29b9d66c3cd0f8af4fafbe92efd0c0556d225)
2008-12-16Fix typo in xf86PickCrtcs()Cooper Yuan1-1/+1
(cherry picked from commit 2a61397d17339113b9e37995b06ca543589814ce)
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-16 23:22:08 +0000