summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-08-31XQuartz: GLX: Drawable does not contain resize anymore.Jeremy Huddleston1-8/+0
2009-08-31Xext: include securproto.h instead of securstr.hPeter Hutterer1-1/+1
Reported-by: Byeong-ryeol Kim Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 4db8950b1dfc3150ee2e9f1f975e9ecb4eabb1f2)
2009-08-31xext: Use proto header rather than the Xext include file, this prevents ↵Benjamin Close1-2/+1
userspace being pulled in causing issues Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit a38ca0063c91ef221f20bf0c4ac0dc84ce07d557)
2009-08-31XQuartz: GL: Unset GL_EXT_gpu_program_parameters for Tiger/ppcJeremy Huddleston1-0/+8
See http://trac.macports.org/ticket/20638 (cherry picked from commit 0f3a89d306838b3c75a73cd1e9e2928737222b70)
2009-08-31XQuartz: GL: Explicitly set GL_EXT symbols to 0 if they are not in ↵Jeremy Huddleston1-0/+73
OpenGL.framework to prevent X11's glext.h from setting them to 1. (cherry picked from commit 7fe37137d826d1b698e87a5b35050dd02f0a4d4b)
2009-08-25Bump version to 1.6.3.901 (1.6.4 RC1)xorg-server-1.6.3.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25Block signals while delivering XTest events (fixes bug 23100)Keith Packard1-1/+1
XTest uses the same event list as all input devices, and input devices use it at SIGIO time. This causes mass confusion when a SIGIO event occurs in the middle of XTest event processing. The master branch has a much different fix, using a separate input queue which reduces latency that may be caused by XTest event queuing; it's a 'nicer' fix in some ways, but this simple fix should solve the problem. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-appleJeremy Huddleston10-39/+92
2009-08-25XQuartz: Use applewmproto 1.4 updated headers.Jeremy Huddleston8-13/+8
(cherry picked from commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)
2009-08-25XQuartz: Use internal xshm header for new xextprotoJeremy Huddleston1-2/+1
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
2009-08-25dbe: Adapt to new headersAdam Jackson1-1/+15
(cherry picked from commit bb6fa39eb3aa044ffc18632288fd59909ff06344)
2009-08-25Update to xextproto 7.0.99.1.Jeremy Huddleston25-61/+58
xextproto had Xlib client headers moved into libXext. Protocol header files are named fooproto.h, header files with constants foo.h or fooconst.h where foo.h was already in use for client-side headers. (cherry picked from commit d3f6b43a240eb763025b3cbf546cb7ae502c94fa)
2009-08-25xsync: Use a local header for server API definitionsAdam Jackson3-1/+178
(cherry picked from commit e0d8f6a8084a3fe6c549c1dee11e4502e316c382)
2009-08-25XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger ↵Jeremy Huddleston2-8/+10
types are defined. (cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
2009-08-25CheckWindowOptionalNeed: Ensure w->optional is set to avoid SEGFAULTJeremy Huddleston1-1/+1
If CheckWindowOptionalNeed is called consecutively (and the first removes optional), then we will SEGFAULT. This can happen in XQuartz because ReparentWindow will call pScreen->ReparentWindow which can DeleteProperty which will CheckWindowOptionalNeed... then ReparentWindow will call it again later indiscriminantly. (cherry picked from commit b608c864ccc59628bd33c033393121b61580460e)
2009-08-25Ensure that rotation updates happen frequentlyKeith Packard3-1/+29
The smart scheduler is designed to minimize scheduler overhead by increasing the interval between WaitForSomething calls when a single client is running. However, the software rotation code depends on its BlockHandler being invoked for screen updates; the long delays caused by the smart scheduler optimizations means that screen updates can be delayed a long time as well. The change is simple -- prevent the smart scheduler from increasing the scheduling interval while any screen is using software rotation. (cherry picked from commit e7dd1efef408effe52d0bd3d3aa0b5d4ee10ed90) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25Perform rotation redisplay before calling driver block handler (which may ↵Keith Packard1-2/+3
flush rendering) The rotation block handler uses regular driver rendering functions to repaint the screen, if those functions queue commands in the driver, it's important that the driver block handler be invoked after the rotated image is drawn. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 1740cda7a37abc7d0a169ab4555b446adaa62211)
2009-08-25xf86_reload_cursors: fix cursor position to eliminate jumping after mode setKeith Packard1-2/+4
xf86_reload_cursors restores the cursor to the correct position, but that must adjust for cursor hot spot and frame before calling down to the hardware function, otherwise the cursor jumps to the wrong position until it is repositioned by the user. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 4aab05e3b3231f1ec9795a66a075d17a722634a7)
2009-08-25glx: Clean up more thoroughly if the drawable of a current context goes away.Michel Dänzer1-1/+24
Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale. (cherry picked from commit 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3)
2009-08-25glx: If a destroyed window is bound to the current context, make it not current.Michel Dänzer1-0/+4
Avoids subsequent crashes due to stale pointers to the DrawableRec, see https://bugs.freedesktop.org/show_bug.cgi?id=21132#c15 and previous comments. Signed-off-by: Michel Dänzer <daenzer@vmware.com> (cherry picked from commit 2075d4bf9e53b8baef0b919da6c44771220cd4a5)
2009-08-25Do not reset lastDeviceEventTime when we do dixSaveScreensRichard Hughes1-2/+0
When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the event time else session clients using IDLETIME will be reset. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066)
2009-08-25dix: update the sprite trace for all masters && floating slaves (#23257)Peter Hutterer1-2/+2
When the windows are restructured, CheckMotion needs to be called for all masters and floating slaves to update the spriteTrace. X.Org Bug 23257 <http://bugs.freedesktop.org/show_bug.cgi?id=23257> (cherry picked from commit 6c292d17053eb2a7e7054e51210f423dbc0cb7e8) Tested-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25xfree86: Link libselinux with Xorg system librariesDan Nicholson1-2/+2
Put the reference to -lselinux in XORG_SYS_LIBS so it isn't added as a make dependency for libxorg.la. Otherwise, make goes looking for a file -lselinux in the current directory, which it obviously won't find. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Justin P. Mattock <justinmattock@gmail.com> (cherry picked from commit c73cd3b265c301b8a54ffe484d6c696f2abefb46)
2009-08-25config: don't shutdown the libhal ctx if it failed to initialize (#23213)Peter Hutterer1-10/+11
Regression introduced by b1c3dc6ae226db178420e3b5f297b94afc87c94c. Shutting down the libhal_ctx if the init failed may cause an abort. This can happen if hald is not yet running at server startup. X.Org Bug 23213 <http://bugs.freedesktop.org/show_bug.cgi?id=23213> Tested-by: Stefan Dirsch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 49046088f10cceaea7da97401d742d3fb59371f5)
2009-08-25Xext: fix up wrong conditions for negative sync transitions.Peter Hutterer1-18/+14
If the counter had a value higher than the trigger value for a negative transition, the trigger value did not get set. The correct sequence of checks is: if (positive transition) if (counter value < trigger value) set up trigger if (negative transition) if (counter value > trigger value) set up trigger Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit db568f9eabf3450d8a023597ff007df355b13ea8)
2009-08-05XQuartz: AIGLX: Provide empty __glXAquaDrawableResize to avoid crashing in ↵Jeremy Huddleston1-0/+7
DoMakeCurrent (cherry picked from commit 60a1d2c2764f2f02c0751940a264588717afce79)
2009-08-05XQuartz: Only save lastpt on mouse/tablet eventsJeremy Huddleston1-44/+39
(cherry picked from commit 552be074e5be6492df3e290e8b7d9daff1a2cb34)
2009-08-05XQuartz: Use mouseLocation rather than locationInWindow when setting lastptJeremy Huddleston1-1/+1
I don't understand the *why* ... I just see that it works better this way for games like Quake2 through wine. It *should* be better the other way, but somehow it's not. I guess this will go in my list of puzzles to unravel. (cherry picked from commit 65ae2d00e1a53f97f2ff9522406ab69d50bf3199)
2009-08-05XQuartz: Don't use location delta for tablets since NSEvent does not give a ↵Jeremy Huddleston1-1/+16
precise delta. (cherry picked from commit 6c5bf756a7f5389cdfe2e43a339d7c31a3e522e9)
2009-08-05XQuartz: Purge redundant QuartzBellJeremy Huddleston3-38/+7
(cherry picked from commit de14a63d20095e1537fd74352850c734d900031d)
2009-08-05Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-appleJeremy Huddleston28-132/+223
2009-07-31Bump release number to 1.6.3xorg-server-1.6.3Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-31XQuartz: Unify how we set our bitmasks for visualsJeremy Huddleston6-86/+77
(cherry picked from commit c230b52c27ce50ac6c27011ec8e88f1b263b25f9)
2009-07-31XQuartz: Dead code removal for StaticColor visualJeremy Huddleston3-548/+0
(cherry picked from commit e457a44e87950207f6c16bf82bf5af11c777ecf1)
2009-07-31XQuartz: Cleanup the bitmask setting for GLX visuals.Jeremy Huddleston1-20/+18
(cherry picked from commit d32c3df258e748958ef997c675dc4fae118c0d7b)
2009-07-31XQuartz: no DirectColorJeremy Huddleston1-2/+2
(cherry picked from commit df2fbc410f2c484612f65a6539a6cb069ef4a468)
2009-07-31XQuartz: Define DDXRingBellJeremy Huddleston2-9/+5
(cherry picked from commit 113347381289497cb2a79994d0ef5f427ae63ac5)
2009-07-29Remove hardcoded gcc -Wall option from configure.acAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126)
2009-07-29selinux: Only activate if policy says to be an object managerAdam Jackson1-0/+4
(cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe)
2009-07-29quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)Ben Skeggs1-0/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4)
2009-07-29config: add HAL error checksRémi Cardona1-10/+22
This patch simplifies error handling in the HAL code and fixes a segfault if libhal_find_device_by_capability() failed. Fixes http://bugs.gentoo.org/278760 Based on a patch by Martin von Gagern <Martin.vGagern@gmx.net> Signed-off-by: Rémi Cardona <remi@gentoo.org> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c)
2009-07-29Don't printf NULL pointers on HAL connection errorAlan Coopersmith1-3/+6
Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9)
2009-07-28XQuartz: Avoid a possible spinlock in applicationWillTerminateJeremy Huddleston1-1/+4
(cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)
2009-07-28XQuartz: Avoid namespace collission for BOOL in SparkleJeremy Huddleston2-4/+2
(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
2009-07-26Bump to version 1.6.2.901 (1.6.3 RC1)xorg-server-1.6.2.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26xfree86: move didLock assignment down to where the function pointer is valid.Dave Airlie1-1/+1
crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so it's actually defined before we use it. Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2. Tested-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26randr: fix operation order so that rotation+transform worksBenjamin Defnet1-3/+3
The matrix multiply to combine rotation and projective transforms was being done in the wrong order. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit b2bf67b61c564a4b92a429ca9ad455403161f33a) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_majorBenjamin Defnet1-3/+5
This moves code out of each implementation of set_mode_major and back into the X server. The real feature here is that the transform is now available in the crtc for use by either xf86CrtcRotate or whatever the driver wants to do. Without this change, the transform was lost for drivers providing the set_mode_major interface. Note that users of this API will want to stop smashing the transformPresent field, and could also stop setting mode/x/y/rotation for new enough X servers, but there's no reason to make that change as it will break things when running against older X servers. Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit 6f59a8160042ea145514fdcb410f17f33fd437c2) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26randr: Nuke broken set_origin shortcutMatthias Hopf1-13/+0
Shortcut is impossible to implement this way, because we don't know for sure whether the crtc of an output has changed or not. (cherry picked from commit cadf65a6e190a8952ad3cc216dc9ea55241de91a) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26randr: fix server crash in RRGetScreenInfoJulien Cristau1-2/+3
We don't return rates to randr < 1.1 clients, so don't allocate space for them. This fixes a FatalError due to not all allocated space being used. X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861> Reported-by: Guillaume Quintin <coincoin169g@gmail.com> Signed-off-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9) Signed-off-by: Keith Packard <keithp@keithp.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 14:52:31 +0000