summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-10-07Fix undefined symbols on alphaalpha-1.7-branchMichael Cree1-6/+6
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-06Fix breakage on alpha caused by c7680befe5aeMatt Turner1-23/+39
Pinpointed by by Michael Cree. Commit c7680befe5ae removed Jensen support, but at the same time broke support for dense memory systems. Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-02xserver 1.7.0Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-02dix: force a minimum of 0 for screen coordinates.Peter Hutterer1-0/+13
Currently the root coordinates may fall into ]-1..0] if the subpixel remainder is less than 0. Screen coordinates mustn't go below 0, so use miPointerSetPosition to cap off the remainder if the coordinates are below 0. This is cheating a bit, a more comprehensive solution to deal with subpixels correctly when crossing screens is needed. For now, this'll do. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Simon Thum <simon.thum@gmx.de> (cherry picked from commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b)
2009-10-02configure: if xnest was requested but modules weren't found, fail.Peter Hutterer1-0/+3
Tested-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 64fe5784b49347e1fd27b0c463be5c16557594c9)
2009-10-02rotate: drop unwrapping inside block handler.Dave Airlie1-7/+3
Keith has shown half the block handlers wrappers are wrong, also dynamic wrapping/unwrapping from what I can see will happen after the drivers, so its really accidental ABI, that we can't change now without modifing drivers. So be safe for 1.7. Signed-off-by: Dave Airlie <airlied@redhat.com> Declared-as-sane-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80)
2009-10-01render: Fix crash in RenderAddGlyphs (#23645)Peter Hutterer1-1/+5
This patch fixes two bugs: size is calculated as glyph height * padded_width. If the client submits garbage, this may get above INT_MAX, resulting in a negative size if size is unsigned. The sanity checks don't trigger for negative sizes and the server goes and writes into random memory locations. If the client submits glyphs with a width or height 0, the destination pixmap is NULL, causing a null-pointer dereference. Since there's nothing to composite if the width/height is 0, we might as well skip the whole thing anyway. Tested with Xvfb, Xephyr and Xorg. X.Org Bug 23645 <http://bugs.freedesktop.org/show_bug.cgi?id=23645> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5)
2009-10-01render: set the glyph picture to NULL by default.Peter Hutterer1-26/+31
In a follow-up patch we may have glyphs with a NULL picture. To cope with that, always set the pictures for glyphs to NULL at creation time and cope with cleaning up such glyphs. Also, since compositing a NULL source doesn't do a lot anyway, skip trying to do so. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7)
2009-10-01exa: avoid infinite loops if UTS sw fallbacks.Michel Dänzer1-5/+5
The upload in finish access can cause an infinite loop if UTS returns FALSE in here. Fixes fd.o bug #24246. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b5fcc5553eb784c9f4826936e839079c0cdee55a)
2009-10-01Re-fix DGA removal.Keith Packard4-18/+38
Removing DGA ended up breaking any drivers calling into the old xf86DiDGAInit function as it tried to see if DGA was already enabled and ended up crashing if the VT wasn't completely initialized. Oops. Also, if the driver initializes DGA itself, have the DiDGA initialization overwrite that information as the DiDGA code will call ReInit on mode detect. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc)
2009-09-30dix/glx/composite: consolidate visual resize in one place.Dave Airlie4-110/+76
The previous code was copied and in both cases incorrectly fixed up the colormaps after resizing the visuals, this patch consolidates the visual resize + colormaps fixups in one place. This version also consolidates the vid allocation for the DepthPtr inside the function. I'm not 100% sure colormap.[ch] is the correct place for this but visuals are mostly created in fb and I know thats not the place to be resizing them. Fixes fd.o bug #19470. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 6ffda5aae75272fabdc27d6f693ae827be119e95)
2009-09-30Fix ShmPutImage non-ZPixmap case.Michel Dänzer1-9/+34
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23298 . (cherry picked from commit 11817a881cb93a89788105d1e575a468f2a8d27c)
2009-09-30ephyr: if -parent is given, check for a trailing -screen. (#24144)Peter Hutterer2-1/+20
If -parent is given, don't open up a new window if -screen is given as well. The commandline option -screen allows to set the depth of the embedded Xephry instance, even though width and height are autoscaled on -parent. This patch checks for a -screen parameter after -parent and - if one is found - delays initializing the screen. The parent window id is stored temporarily but re-set after a -screen argument. The following command is thus valid: Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768 It embeds the first 8-bit screen into window 1234 and opens up a new window for the second screen. Multiple parent arguments are possible, the screens are embedded in-order. X.Org Bug 24144 <http://bugs.freedesktop.org/show_bug.cgi?id=24144> Tested-by: Vic Lee Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 19be992d9dc542b61fa3f4fd32a09071c9e64880)
2009-09-30xfree86: use the DDC size if either width or height of DisplaySize is bogus.Peter Hutterer1-1/+1
If either width or height of DisplaySize is invalid, assume that the configuration is invalid and use the DDC-reported values instead. See Comment 9, Bug 9758. http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 83023ffd09a84ff48e6b99f57ebad101a00478db)
2009-09-30render: Plug a memory leak in AddGlyph. (#23286)Peter Hutterer1-21/+21
AddGlyph was missing the FreePicture() call that DeleteGlyph used, resulting in a memory leak when more than one Glyph was added in a RenderAddGlyphs request. Since the code in AddGlyph and DeleteGlyph is identical, move into a static function to avoid such mistakes in the future. X.Org Bug 23286 <http://bugs.freedesktop.org/show_bug.cgi?id=23286> (cherry picked from commit f772014c435f56db56520ca13ffa39431684f122)
2009-09-28xserver 1.6.99.903 (xserver 1.7 RC3)Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-28Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branchPeter Hutterer37-511/+296
2009-09-28configure: make XNEST default to auto.Tilman Sauerbeck1-1/+1
When we're checking whether to build Xnest, we're comparing the variable to auto but before it never was assigned that. Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> [Xnest was enabled to yes to increase build exposure and catch compiler errors early. The requirements to Xnest are quite low and I expect most developers have them, so Xnext will be enabled on most boxes. Anyone missing those requires probably doesn't want to build Xnest anyway.] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 3db28f92b0c810b452506abbed299a204c90ba0b)
2009-09-27Add (ok, fix) support for DTrace under OS XBen Byer5-8/+12
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
2009-09-27Rootless: Correct border rendering on parent-relative windowsJeremy Huddleston3-0/+48
Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
2009-09-27XQuartz: Fix QuartzSetCursor to match the expected prototype.Jeremy Huddleston1-2/+2
2009-09-27XQuartz: Fix a bunch of compilation warnings about styleJeremy Huddleston15-49/+53
2009-09-27XQuartz: Nuke TSMJeremy Huddleston1-16/+0
It's deprecated in SnowLeopard. Ben and I both have no idea what it is for. It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
2009-09-27XQuartz: Fix inverse map from mode_switch to altJeremy Huddleston1-0/+4
2009-09-28Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"Peter Hutterer4-9/+77
The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus. This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-27XQuartz: Force a keymap resync on the first keypress to workaround XKB ↵Jeremy Huddleston1-0/+11
mucking with our keymap. We need to find a better way to work with XKB on this.
2009-09-27XQuartz: Transition from xEvent based mieq to InternalEventJeremy Huddleston17-440/+170
2009-09-28Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branchPeter Hutterer6-28/+17
2009-09-28xfree86: Hurd fixSamuel Thibault1-1/+1
I hadn't paid attention that the parameters order had changed, here is a trivial patch, please apply. Signed-off-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 78ad6ca9a97440b74019c00a28144ea7d1e03431)
2009-09-27XQuartz: Stop checking version numbers of the bundle because ↵Jeremy Huddleston1-14/+0
CFBundleGetVersionNumber is gimpish (cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
2009-09-27XQuartz: Add pressure/tilt property labelsJeremy Huddleston1-0/+3
2009-09-27XQuartz: Fix a brain-o array indexing problemJeremy Huddleston1-3/+3
/bop Peter
2009-09-27XQuartz: Nuke duplicate locks that make painful headachesJeremy Huddleston1-2/+0
2009-09-27Xi: CopyKeyClass is not static for XQuartzJeremy Huddleston2-1/+2
2009-09-27XQuartz: Use internal xshm header for new xextprotoJeremy Huddleston1-2/+1
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be) (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
2009-09-27XQuartz: GLX capabilities: Allow 16bit accumulation buffersJeremy Huddleston1-6/+8
http://xquartz.macosforge.org/trac/ticket/308 (cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
2009-09-27EXA: Fix mixed pixmaps crash with missing / failing UploadToScreen hook.Michel Dänzer1-12/+14
For the recent mixed pixmaps changes, I failed to realize (or hit in my testing) a problem which can occur if the driver doesn't provide an UploadToScreen hook or provides one which can fail: There can be a crash in exaMemcpyBox() because exaCopyDirtyToFb() passes pExaPixmap->fb_ptr to exaCopyDirty(), but that's normally NULL with driver allocated pixmaps. The solution is to make exaCopyDirty*() no longer rely on pExaPixmap->fb_ptr but use pPixmap->devPrivate.ptr after PrepareAccess instead. Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24167 . (cherry picked from commit 73ae547d5e687ef10dea45801fc627e10ac4b659)
2009-09-27dmx: undefine MITSHM, move undefs to miinitext.c.Kevin E Martin2-13/+12
This patch undefines MITSHM for dmx - we don't support the required screen->ModifyPixmapHeaders. All undefines are moved from dmx-config to miinitext.c, where they belong. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit c9ec2bab2f258798fd6e6676698c732f09571a60)
2009-09-27dmx: reshuffle linker order to avoid errors when MITSHM is undefined.Kevin E Martin2-5/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit fc9d733bab3ff0e4e51b19c73b66196dca563a70)
2009-09-27dmx: core events are always in screen coordinates when passed to GPE.Peter Hutterer1-4/+4
This fixes input in dmx, the pointer appears at the right positions to the clients now. Also mark the spot where we pass in the button state as valuator to GPE with a FIXME. (??) Tested-by: Kevin Martin Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit e7c2598f565e8252dd66ee3e6212b310856476cb)
2009-09-27Xi: update axisVals with the right subpixel data.Peter Hutterer1-1/+1
Subpixel data in data_frac is stored as FP32.32, hence we need to get that down again before adding it to the current value. Reported-by: Thomas Jaeger Tested-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 9bd08c690fc687c4d69bb70536f3079a9184476d)
2009-09-27configure: Unify all library defines that require a specific version.Peter Hutterer1-9/+17
This patch moves all libraries that require a specific version into a single location instead or duplicating them across the configure.ac file. Libraries that do not require specific versions are left where they are. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3)
2009-09-26EXA: Extend mixed pixmaps scheme to allow driver PrepareAccess hook to fail.Michel Dänzer6-216/+232
If the PrepareAccess hook fails, use the DownloadFromScreen hook to retrieve driver pixmap contents to a system RAM copy, perform software rendering on that and copy the results back using the UploadToScreen hook. Use the classic migration logic to minimize transfers (which as a bonus allows slightly cleaning up some of the existing mixed pixmap code). This enables things that weren't possible before with driver-allocated pixmap storage: If some (or all) GPU pixmap storage can't be mapped directly by the CPU, this can be handled between the PrepareAccess and DownloadFrom/UploadToScreen hooks, e.g.: * Radeon KMS on big endian machines can fail PrepareAccess if the pixmap requires byte-swapping and swap bytes in DownloadFrom/UploadToScreen. * Environments where GPU and CPU don't have a shared address space at all. Here the driver PrepareAccess hook will always fail and leave all transfers between GPU / CPU storage to the Download/From/UploadToScreen hooks. Drivers which can handle all pixmaps in the PrepareAccess hook should notice little if any difference. (cherry picked from commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef)
2009-09-26Require libXext >= 1.0.99.4Peter Hutterer1-9/+11
Reported-by: Tilman Sauerbeck Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 9fa73be9fa543a686ea35c861084f5af37d44caa)
2009-09-26kdrive: plug two memory leaks when freeing the KdKeyboard/Pointer.Peter Hutterer2-0/+10
xkbRules, xkbModel and xkbLayout are strdup'd in KdNewKeyboard, need to be freed. The ephyr driver strdups the name on top of the already allocated kdrive-assigned name. Memory must be freed beforehand. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit a9c274df5c37cb4ece6449e934342d8ff8e61705)
2009-09-26dix: plug memory leak in DeviceEnterLeaveEvents.Peter Hutterer1-1/+3
'event' must be freed before exiting. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit fd913136732ff14a0484ca28f60ac1fbf49be81d)
2009-09-26Xi: fix length calculation for ValuatorState in QueryDeviceState reply.Peter Hutterer1-1/+1
The length field needs to include the bytes required for the valuators (INT32) as well. The reply length has the right value and since the valuator state is always last, clients didn't notice the wrong offset. Tested-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139)
2009-09-25configure: fix up tslib check once again.Peter Hutterer1-1/+5
This patch addresses two issues: The check for HAVE_TSLIB = xauto can never be true, the check has been corrected to TSLIB = xauto. Pre-pkgconfig versions of tslib fail to be found, this patch restores the additional AC_CHECK_LIB. However, the pgk-config check must happen before AC_CHECK_LIB, as AC_CHECK_LIB does not seem to honour the LD_LIBRARY_PATH. Thus, if tslib is installed outside of the default paths, AC_CHECK_LIB fails. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked--by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3)
2009-09-25dix: report XI1 axis values correctly if first_valuator != 0Thomas Jaeger1-6/+6
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551)
2009-09-25render: Don't add b8g8r8x8 format for depth 24.Michel Dänzer1-4/+1
The components are required to be packed in the bottom of the pixel, so this format can't fit in depth 24. Also fix up a comment for the addition of BGRA formats. (cherry picked from commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 02:16:40 +0000