Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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)
|
|
version
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
(cherry picked from commit df597709d71f47b8516e27c6fb1bfffd59de5e48)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
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>
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
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>
|
|
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>
|
|
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)
|
|
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)
|
|
Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
(cherry picked from commit 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3)
|
|
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)
|
|
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)
|
|
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>
|
|
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)
|
|
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)
|
|
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)
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126)
|
|
(cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe)
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4)
|
|
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)
|
|
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)
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
(cherry picked from commit b3e3154cce47add97f5561088036ce3b9e7dc937)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
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>
|
|
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 .
(cherry picked from commit 35758544813f156eaac28844e693b2a28f6de316)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Signed-off-by: Kim Woelders <kim@woelders.dk>
|
|
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)
|
|
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>
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
The old DRI2 buffer allocation API wasn't great, but there's no reason to
make the server stop working with those drivers. This patch has the
X server adapting to the API provided by the driver, using the new API where
available and falling back to the old API as necessary. A warning will be
placed in the log file when the old API is in use.
(cherry picked from commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
fixes https://bugs.freedesktop.org/show_bug.cgi?id=22547
This bug was fixed in a big clean-up commit in master, which cannot be
backported (see commit b1dac41fb3853ca8182048ea57b88b6e84ecceb3)
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
vice-versa.
(cherry picked from commit 2a8b8077d8f6001eb57deba60e1009fc99c28668)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Proto headers updating resulting in the server advertising new versions is
broken. This should be applied to every extension.
This fixes the build against slightly-older xineramaproto.
(cherry picked from commit b349a764e98f0d8f221190157ffa0904b91beca5)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
setTexBuffer2 isn't present in this version of the structure, so don't try
to call it.
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when
the pointer left the screen (in a Xinerama setup).
We must call the sprite rendering function if
- SW cursors are enabled, or
- The current device is not the VCP and not attached to the VCP.
Backported from commit 66089e9129a821cfb1983d3d35f41b975a52de5e for
server-1.6-branch by Peter Hutterer
Reported-by: Gordon Yuan <GordonYuan@viatech.com.cn>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Quoting Michel Dänzer in <1234862541.4823.541.camel@thor>:
Unfortunately, there are still bugs left in EXA which prevent it from
working 100% correctly with the option enabled, see
http://bugs.freedesktop.org/show_bug.cgi?id=16416
http://bugs.freedesktop.org/show_bug.cgi?id=19940
So disable it for now to avoid corruption.
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
The lastSetTime value which indicates when the configuration within the
server was last changed was not getting set in the appropriate RandR
requests.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 69a9545d1f8110841538410818df19fd960412c5)
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
Also, remove redundant field swaps and make others match the order in which
they are declared in the xRR*NotifyEvent structs.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit e244a5991e2cc55f5aa2f6e5255f1dabf56f0235)
Signed-off-by: Keith Packard <keithp@keithp.com>
|