summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-10-27xselinux: Use a more informative message when disabled by boolean.server-1.6-branchEamon Walsh1-1/+1
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-27xselinux: Allow SetWindowCreateContext to be used for pixmaps as well.Eamon Walsh1-1/+1
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-27xselinux: Note something in the log if disabled by boolean.Eamon Walsh1-1/+3
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-27xselinux: switch from x_device to separate x_pointer and x_keyboard classes.Eamon Walsh3-11/+14
This will allow separate controls over pointer and keyboard without having to relabel the devices to separate types. [Backport to 1.6] Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-27xace: Relax permissions on XkbGetState from Read to Getattr.Eamon Walsh1-1/+1
This request is used to get the current keyboard group and is called from GTK. It does not return an actual keymap (aside from modifiers) so it should be safe to relax the permission on it. However it does return button state information which should be controlled through a separate pointer Read check. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-27xselinux: Stop special-casing QueryPointer access checks.Eamon Walsh1-11/+0
XACE has been changed to not return BadAccess on device read failures. Thus, no need for this workaround code. [Backport to 1.6] Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-27xace: Fake return values on denials in input polling requests.Eamon Walsh3-7/+23
Instead of returning BadAccess when "read" permission is denied on a device, falsify the device state (buttons down, keys pressed). This is nicer to applications, but may still have undesired side effects. The long-term solution is not to use these requests in event-driven code! Requests affected: QueryPointer, QueryKeymap, XiQueryDevice. [Backport to 1.6] Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-11Bump version to 1.6.5xorg-server-1.6.5Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-11ephyr: 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) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-01Bump to version 1.6.4.901xorg-server-1.6.4.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-30Re-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-27Bump to version 1.6.4xorg-server-1.6.4Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-27Don't send events through the master if the device has SendCoreEvents off.Peter Hutterer2-4/+4
In server 1.6, all devices are attached to the master device (VCP or VCK). Sending an event through the master device means the device is sending core events. If a device is configured as SendCoreEvents, just send through the device, not through the master. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22xfree86/modes: Remove all framebuffer support from DGAKeith Packard3-101/+29
This removes all rendering and mapping code from xf86DiDGA, leaving just mode setting and raw input device access. The mapping code didn't have the offset within /dev/mem for the frame buffer and the pixmap support assumed that the framebuffer was never reallocated. (cherry picked from 0b7c6c728c2e2d8433a188315cc591308a89cd85) Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22dix: append "built-ins" to the font path in SetDefaultFontPathRémi Cardona2-19/+26
49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on a "fixed" font go away but only Xorg could use the built-ins fonts by default. With this commit, all DDXs get "built-ins" appended to their FontPath, not just Xorg. Tested with Xorg, Xvfb and Xnest. (cherry picked from commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52) Signed-off-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22fbdevhw: Test for graphics:fb%d as well as graphics/fb%dDaniel Stone1-1/+7
Apparently the kernel can't decide on an API to expose to userspace, so let's just try both in the hope that one will work. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Michel Dänzer <michel@daenzer.net> (cherry picked from commit f4350c66b493d63fa06be87caa958d7033232ea4)
2009-09-22render: return the supported version rather than just passing the proto's ↵Keith Packard1-2/+5
version Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22dri2: Don't crash if pPriv is NULL.Michel Dänzer1-2/+10
(cherry picked from commit df597709d71f47b8516e27c6fb1bfffd59de5e48) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22Don't reset the lastDeviceEventTime when doing DPMS actionsRichard Hughes1-13/+4
When we change the DPMS mode, don't play games with the last event time as this breaks applications using IDLETIME to turn the backlight off after a preset time. This patch fixes gnome-power-manager and xfce-power-manager Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit c1d901d723c3bee523736eacc15b44a7dff484fe) Signed-off-by: Keith Packard <keithp@keithp.com>
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-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-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-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-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>
2009-07-26Replace dixLookupResource by dixLookupResourceBy{Type,Class}Keith Packard21-94/+161
dixLookupResource attempted to automatically detect whether the caller wanted a lookup by-type or by-class, unfortunately, it guessed wrong for RT_NONE. Instead of trying to make the guess better, this patch just reverts the unification and creates separate functions for each operation. (cherry picked from commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26One = is more than adequate here. Make is sh safe.Robert Noland1-2/+2
(cherry picked from commit b3e3154cce47add97f5561088036ce3b9e7dc937) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26configure: libXinerama isn't needed anymoreRémi Cardona1-1/+1
since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the server no longer needs libXinerama. Signed-off-by: Rémi Cardona <remi@gentoo.org> (cherry picked from commit 2c69deb92e11542f615df0f24fdc03e3b4415475) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.Michel Dänzer1-1/+11
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 . (cherry picked from commit 35758544813f156eaac28844e693b2a28f6de316) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26Fix key repeat problem.Kim Woelders1-1/+1
Signed-off-by: Kim Woelders <kim@woelders.dk>
2009-07-09xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)Adam Jackson1-1/+3
You could be more clever than this, but the wire protocol says this really is an array of not more than 255 ARRAY8, so it's not just a matter of changing the types. (cherry picked from commit 0eb19f9437b7d8c19592e49eedb028771d300d80)
2009-07-08Fix build of drivers with 1.6.2 when not using --install-libxf86configAlan Coopersmith1-6/+2
c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for these from the Makefile, but removed a different set than was done in master branch, causing xf86Parser.h to not be installed, which in turn breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h, which includes xf86Parser.h Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Keith Packard <keithp@keithp.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 21:29:27 +0000